Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorJordan Augé <jordan.auge@lip6.fr>
Tue, 15 Jul 2014 13:51:05 +0000 (15:51 +0200)
committerJordan Augé <jordan.auge@lip6.fr>
Tue, 15 Jul 2014 13:51:05 +0000 (15:51 +0200)

Trivial merge