From: ThomasV <thomasv@gitorious>
Date: Fri, 26 Apr 2013 10:00:57 +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=8116a508a97447cf216d151fb092e926edbe7d24

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

8116a508a97447cf216d151fb092e926edbe7d24