Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 10 Dec 2013 13:22:55 +0000 (14:22 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 10 Dec 2013 13:22:55 +0000 (14:22 +0100)

Trivial merge