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

Trivial merge