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