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

Trivial merge