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

Trivial merge