From: Amir Taaki <genjix@riseup.net>
Date: Fri, 3 Aug 2012 19:13:49 +0000 (-0300)
Subject: Merge branch 'master' of github.com:Spesmilo/Electrum
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=da5571a8703a505db49158003de7689a19400554;p=electrum-nvc.git

Merge branch 'master' of github.com:Spesmilo/Electrum
---

da5571a8703a505db49158003de7689a19400554