Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorPierre Vigreux <root@Portable>
Mon, 14 Apr 2014 14:45:53 +0000 (16:45 +0200)
committerPierre Vigreux <root@Portable>
Mon, 14 Apr 2014 14:45:53 +0000 (16:45 +0200)

Trivial merge