From: ThomasV <thomasv@gitorious>
Date: Thu, 14 Nov 2013 11:27:59 +0000 (+0400)
Subject: Merge branch '3M3RY-mainline_bitcoind'
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=7f5425e999ba480c2b0a7a13a2950e560c6304c8

Merge branch '3M3RY-mainline_bitcoind'
---

7f5425e999ba480c2b0a7a13a2950e560c6304c8