Merge remote branch 'mainline/master'

Conflicts:
	usr/local/www/carp_status.php
	usr/local/www/diag_nanobsd.php
	usr/local/www/services_captiveportal_ip_edit.php

1 files changed, 1 insertions, 1 deletions

diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php
index 3986a46..a1b9ec5 100755
--- a/usr/local/www/xmlrpc.php
+++ b/usr/local/www/xmlrpc.php
@@ -202,7 +202,7 @@ function merge_config_section_xmlrpc($raw_params) {
 	global $config, $xmlrpc_g;
 	$params = xmlrpc_params_to_php($raw_params);
 	if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail'];
-	$config = array_merge_recursive_unique($config, $params[0]);
+	$config = array_merge($config, $params[0]);
 	$mergedkeys = implode(",", array_keys($params[0]));
 	write_config("Merged in config ({$mergedkeys} sections) from XMLRPC client.");
 	return $xmlrpc_g['return']['true'];