From: Gavin Andresen <gavinandresen@gmail.com>
Date: Mon, 26 Mar 2012 18:32:26 +0000 (-0400)
Subject: Merge branch 'deladdr' of https://github.com/sipa/bitcoin
X-Git-Tag: v0.4.0-unstable~129^2~130
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=bf5b80a8ae67b177e06c7024eb3b7a14097a8814

Merge branch 'deladdr' of https://github.com/sipa/bitcoin
---

bf5b80a8ae67b177e06c7024eb3b7a14097a8814