From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 22 May 2012 22:55:49 +0000 (+0000)
Subject: Merge branch '0.4.x' into 0.5.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2^2~2^2
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=3b36da6d277c6f5ad671343e724e0336ce55c893

Merge branch '0.4.x' into 0.5.x

Conflicts:
	src/ui.cpp
	src/ui.h
	src/uibase.cpp
	src/xpm/about.xpm
---

3b36da6d277c6f5ad671343e724e0336ce55c893