Merge changes from master

README

@@ -3,7 +3,7 @@ Electrum - lightweight Bitcoin client
 Licence: GNU GPL v3
 Author: thomasv@gitorious
 Language: Python
-Homepage: http://ecdsa.org/electrum
+Homepage: http://electrum-desktop.com/ 
 
 
 == INSTALL ==
@@ -31,7 +31,11 @@ python setup.py sdist --format=zip,gztar
 
 On Mac OS X:
 
+  # On port based installs
   sudo python setup-release.py py2app
+  # On brew installs
+  ARCHFLAGS="-arch i386 -arch x86_64" sudo /usr/bin/python setup-release.py py2app --includes sip
+
   sudo hdiutil create -fs HFS+ -volname "Electrum" -srcfolder dist/Electrum.app dist/electrum-v0.61-macosx.dmg
 
 

lib/gui_lite.py

@@ -176,6 +176,8 @@ class MiniWindow(QDialog):
 
         menubar = QMenuBar()
         electrum_menu = menubar.addMenu(_("&Bitcoin"))
+        #electrum_menu.addMenu(_("&Servers"))
+        #electrum_menu.addSeparator()
         electrum_menu.addAction(_("&Quit"))
 
         view_menu = menubar.addMenu(_("&View"))

lib/version.py

@@ -1,3 +1,3 @@
-ELECTRUM_VERSION = "0.61"
+ELECTRUM_VERSION = "1.0"
 SEED_VERSION = 4  # bump this everytime the seed generation is modified
 TRANSLATION_ID = 28344 # version of the wiki page