Merge branch 'master' of github.com:spesmilo/electrum

lib/util.py

@@ -30,6 +30,7 @@ def print_json(obj):
 
 
 def check_windows_wallet_migration():
+    if platform.release() != "XP":
         if os.path.exists(os.path.join(os.environ["LOCALAPPDATA"], "Electrum")):
             if os.path.exists(os.path.join(os.environ["APPDATA"], "Electrum")):
                 print_msg("Two Electrum folders have been found, the default Electrum location for Windows has changed from %s to %s since Electrum 1.7, please check your wallets and fix the problem manually." % (os.environ["LOCALAPPDATA"], os.environ["APPDATA"]))