From: Mohamed Larabi <aminelarabi@vis158d.sophia.inria.fr>
Date: Fri, 21 Dec 2012 14:27:23 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
X-Git-Tag: myslice-django-0.1-1~100^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c177439e345967fd87345458bf9d3d591d5cacb6;hp=c177439e345967fd87345458bf9d3d591d5cacb6;p=myslice.git

Merge branch 'master' of ssh://git.onelab.eu/git/myslice-django
---