Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 09:25:38 +0000 (11:25 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 8 Jul 2014 09:25:38 +0000 (11:25 +0200)

Trivial merge