From: ThomasV <thomasv@gitorious>
Date: Fri, 6 Dec 2013 10:12:43 +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=5bbcbea8ce9f9344dffef8a1204c6429ce1166aa

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

5bbcbea8ce9f9344dffef8a1204c6429ce1166aa