Merge branch 'master' of ssh://git.onelab.eu/git/tests
Thierry Parmentelat [Tue, 11 Dec 2012 15:58:18 +0000 (16:58 +0100)]

Trivial merge