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

Trivial merge