merged in trunk -r 17998:18006
authorJosh Karlin <jkarlin@bbn.com>
Tue, 11 May 2010 19:33:45 +0000 (19:33 +0000)
committerJosh Karlin <jkarlin@bbn.com>
Tue, 11 May 2010 19:33:45 +0000 (19:33 +0000)
commit524457658288c015f6c446095d4c645e6d802b5d
tree0c0574f4c217892d9c8359afe8bb31a197f60a51
parente17288b4251451a2376cff24fa90b3568deb9434
merged in trunk -r 17998:18006
sfa/methods/get_aggregates.py
sfa/methods/get_geni_aggregates.py
sfa/methods/get_registries.py
sfa/plc/sfaImport.py
sfa/server/interface.py