Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 27 Feb 2014 13:33:09 +0000 (14:33 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 27 Feb 2014 13:33:09 +0000 (14:33 +0100)

Trivial merge