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

Trivial merge