Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 11:55:04 +0000 (13:55 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 11:55:04 +0000 (13:55 +0200)
commit52100e3aa547c8911b59a3275aff73229d065f32
treea01f218ddfdf5fb616f5ab9a6c252c0c1b521253
parentebf8430d850f17659c922d84e94d234aa7391bac
parentdcb5961dffafd4a24a212decaf47548865e02f48
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab