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)
commit2e767f45cf22f9af0aa4535c76a872d20355e0c0
treee2098a0337f76af2b69412212a82686ac30762db
parentdd5f700e6e2f9969d7c37d3cef3c3624adffe3f5
parentdb03eb2324ae3cc66232f7bedccf3f3f204349c7
Merge branch 'master' of ssh://git.onelab.eu/git/sfa

Conflicts:
tests/testXrn.py
tests/testXrn.py