Merge branch 'AGPL'
authorLuke Dashjr <luke-jr+git@utopios.org>
Sat, 28 Jan 2012 20:19:53 +0000 (15:19 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Sat, 28 Jan 2012 20:19:53 +0000 (15:19 -0500)
commit732d325a9441c2045b89e10ef8692001dcf8bafe
treec74d9fcfc26c5d2e59bfa0f3d19ba688959ddbb9
parent0da7320f102b0d443a0be7609045f1e9b302cddb
parent53388c86ba4ffac82b7ed51c723643bf63332229
Merge branch 'AGPL'

Conflicts:
bitcoin/node.py
interactivemode.py
jsonrpcserver.py
bitcoin/node.py
eloipool.py
interactivemode.py
jsonrpcserver.py
merklemaker.py
merkletree.py
util.py