Bump bitcoin to 0.8.5
Merge branch 'master-old'

Conflicts:
	packages/app-misc/bitcoin/bitcoin-0.8.5.exheres-0