Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 23 Oct 2013 08:06:57 +0000 (11:06 +0300)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 23 Oct 2013 08:06:57 +0000 (11:06 +0300)

Trivial merge