From: ThomasV <thomasv@gitorious>
Date: Sun, 25 Mar 2012 03:49:06 +0000 (+0400)
Subject: Merge branch 'master' of gitorious.org:electrum/server
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=1beac3a3e55773cd4ceb3d284d02e5d036333668

Merge branch 'master' of gitorious.org:electrum/server
---

1beac3a3e55773cd4ceb3d284d02e5d036333668