From: ThomasV <thomasv@gitorious>
Date: Mon, 5 Nov 2012 19:03:17 +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=ebd9e3f10c5a6b650b4df7a2afb019e1f658f7e4

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

ebd9e3f10c5a6b650b4df7a2afb019e1f658f7e4