Merge branch 'master' into senslab2
authorSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:25:55 +0000 (12:25 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Tue, 4 Sep 2012 10:25:55 +0000 (12:25 +0200)
commit7c6754da189699add4e360c5f590e2e64fd181c5
tree8bf6aec241df04f0d435135ea60f043f63d0af90
parent97d09a321eff49c73c09f44a10d1ae0d7767d250
parent84d7c64d69aca48fe56233346a38ad0d6ef778a8
Merge branch 'master' into senslab2

Conflicts:
sfa/util/xrn.py