Merge pull request #1889 from tcatm/multi-wallet

let user select wallet file with -wallet=foo.dat

src/qt/optionsmodel.cpp

@@ -89,7 +89,7 @@ bool OptionsModel::Upgrade()
     settings.setValue("bImportFinished", true);
 
     // Move settings from old wallet.dat (if any):
-    CWalletDB walletdb("wallet.dat");
+    CWalletDB walletdb(strWalletFile);
 
     QList<QString> intOptions;
     intOptions << "nDisplayUnit" << "nTransactionFee";