Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 24 Sep 2013 10:49:46 +0000 (12:49 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 24 Sep 2013 10:49:46 +0000 (12:49 +0200)

Trivial merge