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

diff --git a/server.py b/server.py
index 693e45c..045ba9c 100755 (executable)
--- a/server.py
+++ b/server.py
@@ -50,7 +50,7 @@ try:
     config.readfp(f)
     f.close()
 except:
-    print "Could not read electrum.conf. I will use the dafault values."
+    print "Could not read electrum.conf. I will use the default values."
 
 stopping = False
 block_number = -1