Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorLoic Baron <loic.baron@lip6.fr>
Fri, 6 Dec 2013 16:07:18 +0000 (17:07 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 6 Dec 2013 16:07:18 +0000 (17:07 +0100)

Trivial merge