Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 14 Apr 2014 09:48:02 +0000 (11:48 +0200)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Mon, 14 Apr 2014 09:48:02 +0000 (11:48 +0200)

Trivial merge