Merge branch 'master' of ssh://git.onelab.eu/git/tests
Thierry Parmentelat [Wed, 17 Apr 2013 04:26:04 +0000 (06:26 +0200)]

Trivial merge