Merge branch 'master' of ssh://git.onelab.eu/git/tests
Thierry Parmentelat [Tue, 16 Apr 2013 13:47:02 +0000 (15:47 +0200)]

Trivial merge