Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 09:48:35 +0000 (11:48 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Wed, 23 Jul 2014 09:48:35 +0000 (11:48 +0200)

Trivial merge