Fixed problem from merging from mainstream in slice_manager_slab and api.
authorSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 21 Oct 2011 13:17:01 +0000 (15:17 +0200)
committerSandrine Avakian <sandrine.avakian@inria.fr>
Fri, 21 Oct 2011 13:17:01 +0000 (15:17 +0200)
commit006eb0770abc4e6839841e452eff754c737b99c1
tree63f8d7919e27353dc8d7220989f5cf737a897dce
parentf1fcfbd0c240b33ecec5f2c51364af57a4fcca21
Fixed problem from merging from mainstream in slice_manager_slab and api.
sfa/managers/slice_manager_slab.py
sfa/senslab/SenslabImportUsers.py
sfa/senslab/api.py