From: Thierry Parmentelat Date: Tue, 12 Mar 2013 11:48:14 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django X-Git-Tag: myslice-django-0.1-1~29 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=661a0124cf27c21da192747249d1c0380102bb77 Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django --- 661a0124cf27c21da192747249d1c0380102bb77