From: ThomasV <thomasv@gitorious>
Date: Wed, 21 Nov 2012 19:56:03 +0000 (+0400)
Subject: Merge branch 'master' of github.com:spesmilo/electrum-server
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=3d83205a73c236f7e3f2646e67cd573e57244a52;hp=-c;p=electrum-server.git

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

3d83205a73c236f7e3f2646e67cd573e57244a52