Fixed trusted root problems from merge with master.
authorSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 20 Oct 2011 15:15:43 +0000 (17:15 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Thu, 20 Oct 2011 15:15:43 +0000 (17:15 +0200)
commit9b532d718fcedbc92d3eba4b59d519154e835884
tree203780b7a6fa98b0dc258b2f23437235e3f4b603
parentdb88e8be755e4a4c17fcd65eec98ca420eff91a4
Fixed trusted root problems from merge with 
 Please enter the commit message for your changes. Lines starting
setup.py
sfa/senslab/SenslabImport.py
sfa/senslab/api.py
sfa/senslab/senslab-import.py