Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 28 Nov 2013 10:52:44 +0000 (11:52 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 28 Nov 2013 10:52:44 +0000 (11:52 +0100)

Trivial merge