Merge branch 'master' of ssh://git.onelab.eu/git/tests
Thierry Parmentelat [Tue, 12 Feb 2013 07:12:16 +0000 (08:12 +0100)]

Trivial merge