From: Thierry Parmentelat Date: Wed, 6 Mar 2013 10:46:23 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django X-Git-Tag: myslice-django-0.1-1~72 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=5f3beaa46982befb596ec6ee4e235e99c570f635 Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django --- 5f3beaa46982befb596ec6ee4e235e99c570f635