Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 8 Feb 2014 17:45:16 +0000 (18:45 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 8 Feb 2014 17:45:16 +0000 (18:45 +0100)

Trivial merge