From: Jordan Augé <jordan.auge@lip6.fr>
Date: Mon, 10 Jun 2013 09:51:36 +0000 (+0200)
Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
X-Git-Tag: myslice-0.2-1~120
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=6656b13932a99246b7e75af4ba2f0a137af1bfe1

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

6656b13932a99246b7e75af4ba2f0a137af1bfe1