Merge branch 'master' of github.com:spesmilo/electrum-server
[electrum-server.git] / stop
2011-11-23 ThomasVstart and stop