Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Jun 2010 15:17:16 +0000 (17:17 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 16 Jun 2010 15:17:16 +0000 (17:17 +0200)

Trivial merge