From: slush0 <info@bitcoin.cz>
Date: Fri, 18 Jan 2013 13:10:02 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/spesmilo/electrum
X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=commitdiff_plain;h=3f919e193b15a6096d120828fd742188b6578497

Merge branch 'master' of git://github.com/spesmilo/electrum
---

3f919e193b15a6096d120828fd742188b6578497