Merge branch 'master' of ssh://git.onelab.eu/git/infrastructure
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 30 Aug 2011 07:45:44 +0000 (09:45 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 30 Aug 2011 07:45:44 +0000 (09:45 +0200)

Trivial merge