From: Loic Baron <loic.baron@lip6.fr>
Date: Fri, 28 Mar 2014 14:57:19 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~164^2~4
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=122929fca447f62f650755a77f20eefbfefcf64c;p=myslice.git

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

122929fca447f62f650755a77f20eefbfefcf64c