Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 18 Apr 2013 12:19:15 +0000 (14:19 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Thu, 18 Apr 2013 12:19:15 +0000 (14:19 +0200)

Trivial merge