From: Thierry Parmentelat Date: Fri, 21 Dec 2012 14:40:47 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django X-Git-Tag: myslice-django-0.1-1~100 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=b819c832cd3efe0a37966196430bcf3ec0aaf0cb Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django --- b819c832cd3efe0a37966196430bcf3ec0aaf0cb