Merge branch 'master' of ssh://git.onelab.eu/git/myslice
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 30 Sep 2013 09:14:46 +0000 (11:14 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 30 Sep 2013 09:14:46 +0000 (11:14 +0200)

Trivial merge