From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 24 Jul 2014 13:43:30 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~47^2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=6891e1820029861f4b618723ff10f4aeefeda80e

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

6891e1820029861f4b618723ff10f4aeefeda80e