Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 2 Jan 2015 14:51:13 +0000 (15:51 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 2 Jan 2015 14:51:13 +0000 (15:51 +0100)

Trivial merge