Merge pull request #5859

author Wladimir J. van der Laan <[email protected]>

Thu, 12 Mar 2015 10:13:57 +0000 (11:13 +0100)

committer Wladimir J. van der Laan <[email protected]>

Thu, 12 Mar 2015 10:14:03 +0000 (11:14 +0100)
author Wladimir J. van der Laan <[email protected]>
Thu, 12 Mar 2015 10:13:57 +0000 (11:13 +0100)
committer Wladimir J. van der Laan <[email protected]>
Thu, 12 Mar 2015 10:14:03 +0000 (11:14 +0100)
diff --cc src/net.h
Simple merge
diff --cc src/test/main_tests.cpp
Simple merge
author	Wladimir J. van der Laan <[email protected]>
	Thu, 12 Mar 2015 10:13:57 +0000 (11:13 +0100)
committer	Wladimir J. van der Laan <[email protected]>
	Thu, 12 Mar 2015 10:14:03 +0000 (11:14 +0100)
		1	2
src/net.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/main_tests.cpp	patch \|	diff1 \|	diff2 \|	blob \| history