Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 3 Apr 2013 12:40:26 +0000 (14:40 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 3 Apr 2013 12:40:26 +0000 (14:40 +0200)

Trivial merge