From: tcatm Date: Tue, 22 Feb 2011 02:00:09 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/tcatm/bitcoin into tcatm-master X-Git-Tag: v0.4.0-unstable~234^2~157 X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=6696beed4502fe4e4c8a8d4801cbc4c9007239d9;p=novacoin.git Merge branch 'master' of https://github.com/tcatm/bitcoin into tcatm-master --- 6696beed4502fe4e4c8a8d4801cbc4c9007239d9