Merge branch 'master' of ssh://git.onelab.eu/git/sface
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 23 May 2011 14:26:17 +0000 (16:26 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 23 May 2011 14:26:17 +0000 (16:26 +0200)

Trivial merge