From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 11 Mar 2013 08:27:12 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
X-Git-Tag: myslice-django-0.1-1~43^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9b09d9222d0311b5212eff97f2b3d7fab134a657;p=unfold.git

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

9b09d9222d0311b5212eff97f2b3d7fab134a657