Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 5 Mar 2014 09:50:53 +0000 (10:50 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Wed, 5 Mar 2014 09:50:53 +0000 (10:50 +0100)

Trivial merge