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

Trivial merge