Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 3 Mar 2015 10:50:52 +0000 (11:50 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 3 Mar 2015 10:50:52 +0000 (11:50 +0100)

Trivial merge