From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 7 May 2012 04:10:54 +0000 (+0000)
Subject: Merge branch '0.5.x' into 0.6.0.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2^2~11
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=1fa846bbb620650867a911753b30e209a303118c

Merge branch '0.5.x' into 0.6.0.x

Conflicts:
	src/main.cpp
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
---

1fa846bbb620650867a911753b30e209a303118c