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

Merge branch '0.4.x' into 0.5.0.x

Conflicts:
	src/main.cpp
	src/makefile.unix
---

1fafcee66db843689e2071e844f5e4ab27b8133b