Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 6 Sep 2011 15:09:21 +0000 (17:09 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 6 Sep 2011 15:09:21 +0000 (17:09 +0200)
1  2 
PLC/Persons.py

diff --cc PLC/Persons.py
Simple merge