Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/tests
Thierry Parmentelat [Thu, 18 Apr 2013 09:51:24 +0000 (11:51 +0200)]

Trivial merge