From: Thierry Parmentelat Date: Wed, 13 Mar 2013 10:49:11 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django X-Git-Tag: myslice-django-0.1-1~19 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=c134d1d22720a181f26a0ba7219abc8758b575a1 Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django --- c134d1d22720a181f26a0ba7219abc8758b575a1