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