From: ThomasV <thomasv@gitorious>
Date: Sat, 24 Mar 2012 21:20:25 +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=6433d8aa7fc16952d73da072071d804f70f73439

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

6433d8aa7fc16952d73da072071d804f70f73439