Merge pull request #211 from svost/bitcoin-netbase
authorCryptoManiac <CryptoManiac@users.noreply.github.com>
Sat, 18 Apr 2015 21:46:24 +0000 (14:46 -0700)
committerCryptoManiac <CryptoManiac@users.noreply.github.com>
Sat, 18 Apr 2015 21:46:24 +0000 (14:46 -0700)
Merged from bitcoin 0bd05b5


Trivial merge