Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 27 Mar 2012 12:30:37 +0000 (14:30 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 27 Mar 2012 12:30:37 +0000 (14:30 +0200)

Trivial merge