Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 16 Dec 2013 16:26:36 +0000 (17:26 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 16 Dec 2013 16:26:36 +0000 (17:26 +0100)

Trivial merge