From: ThomasV <thomasv@gitorious>
Date: Mon, 16 Dec 2013 19:15:09 +0000 (+0400)
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=240db7c28d2e6a0d0078c42f81b2b110615e88c6

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

240db7c28d2e6a0d0078c42f81b2b110615e88c6