Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 16:15:39 +0000 (18:15 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 25 Sep 2013 16:15:39 +0000 (18:15 +0200)

Trivial merge