Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 16:34:04 +0000 (17:34 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Mon, 3 Mar 2014 16:34:04 +0000 (17:34 +0100)

Trivial merge