From: Gavin Andresen <gavinandresen@gmail.com>
Date: Thu, 22 Mar 2012 12:51:37 +0000 (-0400)
Subject: Merge branch 'master' of github.com:bitcoin/bitcoin
X-Git-Tag: v0.4.0-unstable~129^2~141
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=e53f03172a4b6d89c5a65d367c47f6d126692ca6

Merge branch 'master' of github.com:bitcoin/bitcoin
---

e53f03172a4b6d89c5a65d367c47f6d126692ca6