Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 20 Dec 2013 11:20:35 +0000 (12:20 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 20 Dec 2013 11:20:35 +0000 (12:20 +0100)

Trivial merge