From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 13 Nov 2013 07:08:36 +0000 (+0100)
Subject: Merge branch 'master' into newnames
X-Git-Tag: myslice-0.3-0~113^2~7^2~20
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0120bc491b3464f4981270a28ac153fa62f3b08b;hp=0120bc491b3464f4981270a28ac153fa62f3b08b;p=myslice.git

Merge branch 'master' into newnames

Conflicts:
	portal/templates/validate_pending.html
---