Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 19 Oct 2010 11:01:54 +0000 (14:01 +0300)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 19 Oct 2010 11:01:54 +0000 (14:01 +0300)
commitba2aaa438f939a4b5c697052e37b1c3218901319
treef87d1de616674fff90578350f4bf660ffeba71dd
parent06b330f0ee047bdb107e43e82b1d7356c876bc15
parent1063c68f7a401565891afcc3cbeee5c9e94942b9
Merge branch 'master' of ssh://git.onelab.eu/git/sfa

Conflicts:
sfa/managers/aggregate_manager_max.py
sfa/util/xrn.py
sfa/managers/aggregate_manager_max.py
sfa/managers/registry_manager_pl.py
sfa/util/xrn.py