Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorYasin Rahman <loic.baron@lip6.fr>
Fri, 13 Mar 2015 13:29:29 +0000 (14:29 +0100)
committerYasin Rahman <loic.baron@lip6.fr>
Fri, 13 Mar 2015 13:29:29 +0000 (14:29 +0100)

Trivial merge