Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 8 May 2014 11:32:38 +0000 (07:32 -0400)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 8 May 2014 11:32:38 +0000 (07:32 -0400)

Trivial merge