Merge branch 'master' into senslab2
Sandrine Avakian [Mon, 16 Jan 2012 14:17:48 +0000 (15:17 +0100)]
Conflicts:
sfa/managers/registry_manager.py

1  2 
setup.py
sfa/client/sfi.py
sfa/plc/plslices.py
sfa/trust/credential.py

diff --cc setup.py
Simple merge
Simple merge
@@@ -1,7 -1,7 +1,8 @@@
  from types import StringTypes
  from collections import defaultdict
 +import sys
  
+ from sfa.util.sfatime import utcparse, datetime_to_epoch
  from sfa.util.sfalogging import logger
  from sfa.util.xrn import Xrn, get_leaf, get_authority, urn_to_hrn
  #from sfa.util.policy import Policy
Simple merge