Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin Rahman <mohammed-yasin.rahman@lip6.fr>
Tue, 24 Mar 2015 14:43:06 +0000 (15:43 +0100)
committerYasin Rahman <mohammed-yasin.rahman@lip6.fr>
Tue, 24 Mar 2015 14:43:06 +0000 (15:43 +0100)

Trivial merge