Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 19 Sep 2013 17:18:43 +0000 (19:18 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 19 Sep 2013 17:18:43 +0000 (19:18 +0200)

Trivial merge