Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 26 Feb 2014 14:05:59 +0000 (15:05 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 26 Feb 2014 14:05:59 +0000 (15:05 +0100)

Trivial merge