Merge branch 'master' into senslab2
authorNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 18 Nov 2011 16:38:34 +0000 (17:38 +0100)
committerNicolas Turro <Nicolas.Turro@inria.fr>
Fri, 18 Nov 2011 16:38:34 +0000 (17:38 +0100)
commit19dff4d49e0bf51857903d759947d0a1b01229a4
treec1546eec59a180b525b9957c121863446af8dc91
parentc7fb5a2d1a0b12916aeee29091020e292560ab96
parent98a3d5acb879be2ef37b3d5b9689f18bdb824702
Merge branch 'master' into senslab2

Conflicts:
sfa/util/xml.py