Merge pull request #1087 from sipa/fix_1086

Fix #1086: add /testnet to passed datadir

src/util.cpp

@@ -836,9 +836,9 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific)
         path = mapArgs["-datadir"];
     } else {
         path = GetDefaultDataDir();
+    }
     if (fNetSpecific && GetBoolArg("-testnet", false))
         path /= "testnet";
-    }
 
     fs::create_directory(path);