Merge pull request #4817

author Pieter Wuille <[email protected]>

Mon, 15 Sep 2014 05:24:05 +0000 (07:24 +0200)

committer Pieter Wuille <[email protected]>

Mon, 15 Sep 2014 05:29:04 +0000 (07:29 +0200)
author Pieter Wuille <[email protected]>
Mon, 15 Sep 2014 05:24:05 +0000 (07:24 +0200)
committer Pieter Wuille <[email protected]>
Mon, 15 Sep 2014 05:29:04 +0000 (07:29 +0200)
diff --cc src/core.h
Simple merge
diff --cc src/txmempool.cpp
Simple merge
author	Pieter Wuille <[email protected]>
	Mon, 15 Sep 2014 05:24:05 +0000 (07:24 +0200)
committer	Pieter Wuille <[email protected]>
	Mon, 15 Sep 2014 05:29:04 +0000 (07:29 +0200)
		1	2
src/core.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/txmempool.cpp	patch \|	diff1 \|	diff2 \|	blob \| history