From: Jordan Augé <jordan.auge@lip6.fr>
Date: Tue, 7 May 2013 08:39:09 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~130
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=544e6ac78d490061f848f98adb0e08574b474371;p=myslice.git

Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
---

544e6ac78d490061f848f98adb0e08574b474371