Merge branch 'master' of ssh://git.onelab.eu/git/build
authorMohamed Larabi <mohamed.larabi@inria.fr>
Fri, 28 Feb 2014 14:34:45 +0000 (15:34 +0100)
committerMohamed Larabi <mohamed.larabi@inria.fr>
Fri, 28 Feb 2014 14:34:45 +0000 (15:34 +0100)

Trivial merge