Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 19 Oct 2010 14:14:33 +0000 (17:14 +0300)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 19 Oct 2010 14:14:33 +0000 (17:14 +0300)
Conflicts:
tests/testXrn.py

1  2 
tests/testXrn.py

Simple merge