Merge branch '0.4.x' into 0.5.x
[novacoin.git] / contrib / debian / bitcoind.manpages
1 debian/manpages/bitcoind.1
2 debian/manpages/bitcoin.conf.5