Merge branch 'bcnode'
authorLuke Dashjr <luke-jr+git@utopios.org>
Thu, 2 Feb 2012 16:58:08 +0000 (11:58 -0500)
committerLuke Dashjr <luke-jr+git@utopios.org>
Thu, 2 Feb 2012 16:58:08 +0000 (11:58 -0500)
commitdd3a7c80654c4c2b227a8b51bcb5c0a6e2ad776c
treea85e25ebe5a37cede2ffcd23222163ce4eaeb2b7
parent18b5bbec75d114958e1a18c5539fdad68c76dbaf
parentb4ca7597beb0d912ae82aa773e4b9cdf4d291084
Merge branch 'bcnode'

Conflicts:
jsonrpcserver.py
eloipool.py
networkserver.py