Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 18 Mar 2013 08:11:13 +0000 (09:11 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Mon, 18 Mar 2013 08:11:13 +0000 (09:11 +0100)

Trivial merge