bitcoin/bitcoin — pull request #4778 by laanwj (2014-08-28 15:16:45+00:00)
Title: Move CMerkleTx to wallet.cpp/h

It is only used by the wallet so it has no place in main.