Auto merge of #2874 - arcalinea:tx_block_expiry, r=arcalinea

author Homu <[email protected]>

Sat, 24 Feb 2018 02:37:48 +0000 (18:37 -0800)

committer Homu <[email protected]>

Sat, 24 Feb 2018 02:37:48 +0000 (18:37 -0800)
author Homu <[email protected]>
Sat, 24 Feb 2018 02:37:48 +0000 (18:37 -0800)
committer Homu <[email protected]>
Sat, 24 Feb 2018 02:37:48 +0000 (18:37 -0800)
diff --cc qa/pull-tester/rpc-tests.sh
Simple merge
diff --cc src/main.cpp
Simple merge
author	Homu <[email protected]>
	Sat, 24 Feb 2018 02:37:48 +0000 (18:37 -0800)
committer	Homu <[email protected]>
	Sat, 24 Feb 2018 02:37:48 +0000 (18:37 -0800)
		1	2
qa/pull-tester/rpc-tests.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history