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

Trivial merge