Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin Rahman <loic.baron@lip6.fr>
Tue, 17 Mar 2015 15:19:18 +0000 (16:19 +0100)
committerYasin Rahman <loic.baron@lip6.fr>
Tue, 17 Mar 2015 15:19:18 +0000 (16:19 +0100)

Trivial merge