Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Fri, 2 Jan 2015 13:20:49 +0000 (14:20 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 2 Jan 2015 13:20:49 +0000 (14:20 +0100)
commit95fcc57dcf3c6d264dfe895a8d0255a489ee2c8c
treeb79cde4c6fdb34913de4b7d2c107650661eb7cc3
parentd872f626aac4a56a193845cd40e3527e3f975bc3
parent7464fb5c0d4d4857963b52b944b27df41e4ec1f6
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab