git.onelab.eu Git - sfa.git/commit

author	Sandrine Avakian <sandrine.avakian@inria.fr>
	Fri, 16 Dec 2011 10:38:51 +0000 (11:38 +0100)
committer	Sandrine Avakian <sandrine.avakian@inria.fr>
	Fri, 16 Dec 2011 10:38:51 +0000 (11:38 +0100)
commit	0d5868a5dabd1bb986ad1248df0885770a81b89c
tree	c0c282c8715399b837316b5c5c75692766c5647d	tree \| snapshot
parent	02a4a59a4a49183ec8c631cc03243b97f4602d50	commit \| diff

Propagating changes from merge with master sfa version 2.0.5
First step, minor changes

sfa/managers/aggregate_manager_slab.py		diff \| blob \| history
sfa/senslab/slabdriver.py		diff \| blob \| history
sfa/senslab/slabslices.py	[moved from sfa/senslab/slices.py with 99% similarity]	diff \| blob \| history

sfa