From: ThomasV <thomasv1@gmx.de>
Date: Fri, 7 Mar 2014 09:23:22 +0000 (+0100)
Subject: Merge branch 'master' of github.com:spesmilo/electrum-server
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=a126aaa670bcc2e40691c4cf91c601b8812150b3

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

a126aaa670bcc2e40691c4cf91c601b8812150b3