From: ThomasV <thomasv@gitorious>
Date: Thu, 1 Dec 2011 16:41:56 +0000 (+0300)
Subject: Merge commit 'refs/merge-requests/6' of git://gitorious.org/electrum/electrum into... 
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=fbec8794e64183e748aa42f2812bb6f237f60cdf;hp=fdeb0fddcbe2cfafb80febeac1e4c3f35ceb6ee3;p=electrum-server.git

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

diff --git a/server.py b/server.py
index 693e45c..045ba9c 100755
--- 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