Merge branch 'master-test' of github.com:bitcoin-abe/bitcoin-abe
Merge branch 'master' into small
Merge branch 'small' of github.com:bitcoin-abe/bitcoin-abe into small