Merge branch 'poller' of github.com:spesmilo/electrum-server into poller poller
authorThomasV <thomasv1@gmx.de>
Mon, 28 Apr 2014 11:53:06 +0000 (13:53 +0200)
committerThomasV <thomasv1@gmx.de>
Mon, 28 Apr 2014 11:53:06 +0000 (13:53 +0200)

Trivial merge