Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 12 Jul 2012 12:27:07 +0000 (14:27 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 12 Jul 2012 12:27:07 +0000 (14:27 +0200)
commitb6dcfc034473c011988fba0d02bbeb6406925465
tree3f8de5006e1e9760b3bbd87832fafbc87964802b
parent5e20bae7c2007ed9349be7af53f1b6e342de1da7
parent999893377056972a8ac599135dee3f6cbe530f3f
Merge branch 'master' into senslab2
sfa/client/sfi.py
sfa/util/xrn.py