Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 2 Sep 2013 16:39:31 +0000 (18:39 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 2 Sep 2013 16:39:31 +0000 (18:39 +0200)

Trivial merge