Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 25 Oct 2011 14:41:40 +0000 (16:41 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 25 Oct 2011 14:41:40 +0000 (16:41 +0200)
commit8e13e7b178d5ffec16cdfa0e3b81f883fca5ec68
tree3e356c6d6e4683f5ebeb3a98a85c08aa3e9705ea
parent0505ed9c7ca98596e4369f7302144f7a6dc958b2
parent83e1154739a900fd64519609f7b0017937bf1987
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
sfa/managers/aggregate_manager.py
sfa/managers/aggregate_manager_vini.py
sfa/managers/slice_manager.py