Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 10 Jul 2014 21:06:15 +0000 (23:06 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 10 Jul 2014 21:06:15 +0000 (23:06 +0200)
commit5ba8b5d74143fe32c3059577017d235947c6b376
treef37b38a8faa71a0f72e86433ad6f1aa86d12d6bc
parentb666b8f4215c5823cbf86f9a3bc31e7294b1f486
parentfc5b98dabe913cc8fd3c6ea7ed15b5485e7caa8e
Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab