Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 28 Jun 2013 07:18:31 +0000 (09:18 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 28 Jun 2013 07:18:31 +0000 (09:18 +0200)

Trivial merge