Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 20 Aug 2014 16:05:27 +0000 (18:05 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 20 Aug 2014 16:05:27 +0000 (18:05 +0200)

Trivial merge