bitcoin/bitcoin — pull request #2787 by Diapolo (2013-06-23 15:41:35+00:00)
Title: fix makefiles and init.cpp after chainparams merge

- add missing chainparams.o to some makefiles
- remove a double-include of chainparams.h in init.cpp