From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 15 May 2012 07:23:32 +0000 (+0000)
Subject: Merge remote branch 'origin/0.6.2' into 0.6.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~12
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=99101685f632748c774e3f5d99b7a181ace4fdd6

Merge remote branch 'origin/0.6.2' into 0.6.x

Conflicts:
	src/addrman.cpp
---

99101685f632748c774e3f5d99b7a181ace4fdd6