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)
commit12ccbb40a69621eb307e30b69616c70a0de85f67
treea0f0b9f69c8e3261a1e30779252d18be13bba21d
parentdfec0fc7cccc6b0bbe1b8625800d2b9c5a3e5bca
parent10d1db782646af44512a882c05ab998f537c6267
Merge branch 'poller' of github.com:spesmilo/electrum-server into poller