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

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

507aaa799377f1f5838bd8b8de19c4aef90e0ddc