From: ThomasV <thomasv@gitorious>
Date: Wed, 30 Jan 2013 19:41:14 +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=f764f03046e003ca032588a025dc58a2fa180587

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

f764f03046e003ca032588a025dc58a2fa180587