From: ThomasV <thomasv@gitorious>
Date: Sat, 24 Mar 2012 20:55:56 +0000 (+0300)
Subject: Merge branch 'master' of gitorious.org:electrum/server
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=f7279c71bf2914cbc233df5a9f0a8b627845d6d3

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

f7279c71bf2914cbc233df5a9f0a8b627845d6d3