Merge branch 'master' of ssh://git.onelab.eu/git/tests
Thierry Parmentelat [Wed, 24 Apr 2013 14:46:47 +0000 (16:46 +0200)]

Trivial merge