Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 2 Dec 2010 18:04:55 +0000 (19:04 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 2 Dec 2010 18:04:55 +0000 (19:04 +0100)

Trivial merge