From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 16 Mar 2012 20:45:32 +0000 (-0400)
Subject: Merge branch '0.5.0.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~16
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=eca170286ef79096b9005c28d0a6e1145b440f60

Merge branch '0.5.0.x' into 0.5.x

Conflicts:
	bitcoin-qt.pro
	doc/README
	doc/README_windows.txt
	share/setup.nsi
	src/serialize.h
---

eca170286ef79096b9005c28d0a6e1145b440f60