From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 11 Oct 2013 19:24:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: myslice-0.2-5~12^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9961edb421c6156048be5688d249047daf250e70;hp=9961edb421c6156048be5688d249047daf250e70;p=unfold.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
	portal/urls.py
---