From: ThomasV <thomasv@gitorious>
Date: Thu, 14 Nov 2013 17:02:46 +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=4082eeacccf3ecec237fe45945af4d9b78352c0e

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

4082eeacccf3ecec237fe45945af4d9b78352c0e