Enable merge mining CLI option

src/main.cpp

@@ -97,7 +97,7 @@ void p2pool_usage()
 		"--no-igd              An alias for --no-upnp\n"
 		"--upnp-stratum        Port forward Stratum port (it's not forwarded by default)\n"
 #endif
-//		"--merge-mine          IP:port and wallet address for another blockchain to merge mine with\n"
+		"--merge-mine          IP:port and wallet address for another blockchain to merge mine with\n"
 		"--version             Print p2pool's version and build details\n"
 #ifdef WITH_TLS
 		"--tls-cert file       Load TLS certificate chain from \"file\" in the PEM format\n"

src/params.cpp

@@ -254,8 +254,8 @@ Params::Params(const std::vector<std::vector<std::string>>& args)
 		}
 #endif
 
-		if ((arg[0] == "merge-mine") && has2(arg)) {
-			LOGWARN(0, "Merge mining is not supported in Salvium P2Pool. --merge-mine flag ignored.");
+		if ((arg[0] == "merge-mine") && has1(arg) && has2(arg)) {
+			m_mergeMiningHosts.emplace_back(arg[1], arg[2]);
 			ok = true;
 		}