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

Trivial merge