Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 26 Apr 2012 08:52:40 +0000 (10:52 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 26 Apr 2012 08:52:40 +0000 (10:52 +0200)
commitb47e82ba386c944c888970cc254b09d80ac112a7
treee16ae9d3b339ba6ef64b3f484518334045e7a2d8
parent3db8adc0b718a9939abadd01b1ba0cf7a89ff47e
parent951442dd2320e49e39807476ffc248377886c00f
Merge branch 'master' into senslab2
sfa/client/sfi.py
sfa/util/xrn.py