Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Wed, 14 May 2014 13:54:28 +0000 (15:54 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 14 May 2014 13:54:28 +0000 (15:54 +0200)

Trivial merge