Merge branch '0.4.x' into 0.5.0.x

author Luke Dashjr <luke-jr+git@utopios.org>

Tue, 27 Mar 2012 00:06:55 +0000 (20:06 -0400)

committer Luke Dashjr <luke-jr+git@utopios.org>

Tue, 27 Mar 2012 00:06:55 +0000 (20:06 -0400)
author Luke Dashjr <luke-jr+git@utopios.org>
Tue, 27 Mar 2012 00:06:55 +0000 (20:06 -0400)
committer Luke Dashjr <luke-jr+git@utopios.org>
Tue, 27 Mar 2012 00:06:55 +0000 (20:06 -0400)
diff --cc src/db.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/net.cpp
Simple merge
author	Luke Dashjr <luke-jr+git@utopios.org>
	Tue, 27 Mar 2012 00:06:55 +0000 (20:06 -0400)
committer	Luke Dashjr <luke-jr+git@utopios.org>
	Tue, 27 Mar 2012 00:06:55 +0000 (20:06 -0400)
		1	2
src/db.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/net.cpp	patch \|	diff1 \|	diff2 \|	blob \| history