Merge branch 'postfeb20' of https://github.com/sipa/bitcoin

author Gavin Andresen <[email protected]>

Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)

committer Gavin Andresen <[email protected]>

Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)
author Gavin Andresen <[email protected]>
Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)
committer Gavin Andresen <[email protected]>
Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)
diff --cc src/main.cpp
Simple merge
diff --cc src/net.h
Simple merge
author	Gavin Andresen <[email protected]>
	Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)
committer	Gavin Andresen <[email protected]>
	Wed, 22 Feb 2012 16:06:44 +0000 (11:06 -0500)
		1	2
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/net.h	patch \|	diff1 \|	diff2 \|	blob \| history