Merge commit 'refs/merge-requests/3' of git://gitorious.org/electrum/server into...
[electrum-server.git] / stop
2011-11-23 ThomasVstart and stop