Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Thu, 27 Mar 2014 18:34:01 +0000 (19:34 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Thu, 27 Mar 2014 18:34:01 +0000 (19:34 +0100)

Trivial merge