Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 22 Jul 2014 06:44:14 +0000 (08:44 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 22 Jul 2014 06:44:14 +0000 (08:44 +0200)

Trivial merge