From: Loic Baron <loic.baron@lip6.fr>
Date: Tue, 6 May 2014 16:19:55 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~112
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=47e44bc61b088033691c43be4609e8c4248b2cb8

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

47e44bc61b088033691c43be4609e8c4248b2cb8