Merge branch 'onelab' of https://github.com/onelab-eu/myslice into onelab
authorLoic Baron <loic.baron@lip6.fr>
Thu, 10 Dec 2015 16:35:47 +0000 (17:35 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 10 Dec 2015 16:35:47 +0000 (17:35 +0100)

Trivial merge