Merge branch 'master' of ssh://git.onelab.eu/git/tests
Thierry Parmentelat [Mon, 18 Mar 2013 08:11:13 +0000 (09:11 +0100)]

Trivial merge