From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 12 Nov 2013 14:35:01 +0000 (+0100)
Subject: Merge branch 'master' into newnames
X-Git-Tag: myslice-0.3-0~113^2~7^2~24
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=f8a614d0271ddc3046e18d826df01f72a861257c

Merge branch 'master' into newnames

Conflicts:
	ui/topmenu.py
---

f8a614d0271ddc3046e18d826df01f72a861257c