From: ThomasV <thomasv@gitorious>
Date: Tue, 4 Mar 2014 19:51:20 +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=9baf5ef4407f8d1aa5bc894ea1a0f34a9d8bae3c

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

9baf5ef4407f8d1aa5bc894ea1a0f34a9d8bae3c