commit 28e15b7a445404273e6488243827b4a85b9253e1 Merge: aedb495 1f773dd Author: Nate Hardison <nate@dn0a20293b.sunet> Date: Sat May 14 13:53:54 2011 -0700 Merge branch 'master' of http://www.bamsoftware.com/git/jscat .gitignore | 1 + connector.py | 8 +- crossdomaind.py | 14 +++- facilitator.py | 279 +++++++++++++++++++++++++++++++++---------------------- reconnector.py | 8 +- 5 files changed, 187 insertions(+), 123 deletions(-)