Merge commit 'refs/merge-requests/2' of git://gitorious.org/electrum/server into...

diff --git a/electrum.conf.sample b/electrum.conf.sample
index f56f155..941f362 100644 (file)
--- a/electrum.conf.sample
+++ b/electrum.conf.sample
@@ -1,10 +1,12 @@
 [server]
 host = localhost
-port = 50000
+native_port = 50000
+stratum_tcp_port = 50001
+stratum_http_port = 8081
 password = secret
 banner = Welcome to Electrum!
 irc = yes
-ircname = public Electrum server
+irc_nick = MyNick
 cache = no
 
 [database]