From: ThomasV <thomasv1@gmx.de>
Date: Mon, 28 Apr 2014 11:53:06 +0000 (+0200)
Subject: Merge branch 'poller' of github.com:spesmilo/electrum-server into poller
X-Git-Url: https://git.novaco.in/?p=electrum-server.git;a=commitdiff_plain;h=poller

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

12ccbb40a69621eb307e30b69616c70a0de85f67