From: Loic Baron <loic.baron@lip6.fr>
Date: Sat, 4 Oct 2014 09:16:38 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.2~1^2~17^2~2
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=44aeb7045d837454a2ecb33fc399fe06320d8387

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

44aeb7045d837454a2ecb33fc399fe06320d8387