From: Thierry Parmentelat Date: Tue, 9 Apr 2013 06:43:35 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django X-Git-Tag: myslice-0.2-1~169 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=c8ac1863026e5736065065e931e20de310cb3b06 Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django --- c8ac1863026e5736065065e931e20de310cb3b06