Merge remote-tracking branch 'upstream/master'
[electrum-server.git] / start
2011-11-23 ThomasVstart and stop