Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Fri, 21 Feb 2014 13:15:03 +0000 (14:15 +0100)
committerJordan Augé <jordan.auge@lip6.fr>
Fri, 21 Feb 2014 13:15:03 +0000 (14:15 +0100)

Trivial merge