From: ThomasV <thomasv@gitorious>
Date: Fri, 16 Nov 2012 13:49:20 +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=b5512e97107b535006fb63ecba7c9b31f2a2e75b

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

b5512e97107b535006fb63ecba7c9b31f2a2e75b