From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 27 Feb 2014 13:33:09 +0000 (+0100)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.1~275
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=62729d5f3eb7de6691e0be43303a3986f5447776;p=myslice.git

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

62729d5f3eb7de6691e0be43303a3986f5447776