From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 19 Oct 2010 14:14:33 +0000 (+0300)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: sfa-1.0-5~8
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=2e767f45cf22f9af0aa4535c76a872d20355e0c0

Merge branch 'master' of ssh://git.onelab.eu/git/sfa

Conflicts:
	tests/testXrn.py
---

2e767f45cf22f9af0aa4535c76a872d20355e0c0