Merge pull request #282 from svost/from-bitcoin
authorCryptoManiac <CryptoManiac@users.noreply.github.com>
Sun, 21 Feb 2016 18:16:04 +0000 (21:16 +0300)
committerCryptoManiac <CryptoManiac@users.noreply.github.com>
Sun, 21 Feb 2016 18:16:04 +0000 (21:16 +0300)
From bitcoin


Trivial merge