Merge branch 'bugfix_close_rmsch'
authorLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Nov 2012 01:42:53 +0000 (01:42 +0000)
committerLuke Dashjr <luke-jr+git@utopios.org>
Mon, 12 Nov 2012 01:42:53 +0000 (01:42 +0000)
commitcf378a12b129f8d1635a2728a31f0df818cfe305
tree42d8eccca13cf6ca22b6a028b266c492eb84289f
parent91245c6af41e970e0d43bcc10f1c52382d3c67c5
parent69b909b51842c1bc88e85bb16b807da231d05049
Merge branch 'bugfix_close_rmsch'

Conflicts:
jsonrpcserver.py
networkserver.py