From: ThomasV <thomasv@gitorious>
Date: Sun, 28 Apr 2013 05:53:58 +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=94bbc06488057c36b526b39e8d4eaf1ab7a2a8de

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

94bbc06488057c36b526b39e8d4eaf1ab7a2a8de