From: Celil <celil.kj@gmail.com>
Date: Mon, 18 Jul 2011 22:45:55 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/laanwj/bitcoin-qt
X-Git-Tag: v0.4.0-unstable~226^2~57^2~107^2~2
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=29f9e4e4006e626dc72df0f41b89b83f78a3b764;p=novacoin.git

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

29f9e4e4006e626dc72df0f41b89b83f78a3b764