Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 19 Dec 2011 07:47:39 +0000 (08:47 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 19 Dec 2011 07:47:39 +0000 (08:47 +0100)

Trivial merge