Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab myslice-1.3
authorLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 12:58:51 +0000 (14:58 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Tue, 28 Apr 2015 12:58:51 +0000 (14:58 +0200)

Trivial merge