Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 3 Jul 2013 06:26:02 +0000 (08:26 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 3 Jul 2013 06:26:02 +0000 (08:26 +0200)

Trivial merge