Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 30 Jul 2014 12:41:01 +0000 (14:41 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 30 Jul 2014 12:41:01 +0000 (14:41 +0200)
commit6e1d4c932e926236ad7a9a73b8ddcc49a8f8ff02
treea88638bada8ac63e70609a96ae267cd4d141da4b
parentfb63dd5524e740c477036d6da3d1e66de329a424
parente15aa1aaa4cd8749f432e19abf10a5469be43185
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab