From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 4 Sep 2012 10:25:55 +0000 (+0200)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~91
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=7c6754da189699add4e360c5f590e2e64fd181c5

Merge branch 'master' into senslab2

Conflicts:
	sfa/util/xrn.py
---

7c6754da189699add4e360c5f590e2e64fd181c5