# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1464607048 -7200
# Node ID 843fe134453e885c7f3e21e287cc14c105dfbc2e
# Parent  45d28235ebe0e0c0e7c74fd9020c60bf74b29e95# Parent  0db72fac2faa414544bc9889834aaa58c5d436ff
Merge 0.10->trunk

diff -r 45d28235ebe0 -r 843fe134453e prosodyctl
--- a/prosodyctl	Sat May 28 12:51:12 2016 +0200
+++ b/prosodyctl	Mon May 30 13:17:28 2016 +0200
@@ -1261,13 +1261,13 @@
 						end
 						if config.get(host, "component_module") == nil
 							and not x509_verify_identity(host, "_xmpp-client", cert) then
-							print("    Not vaild for client connections to "..host..".")
+							print("    Not valid for client connections to "..host..".")
 							cert_ok = false
 						end
 						if (not (config.get(host, "anonymous_login")
 							or config.get(host, "authentication") == "anonymous"))
 							and not x509_verify_identity(host, "_xmpp-server", cert) then
-							print("    Not vaild for server-to-server connections to "..host..".")
+							print("    Not valid for server-to-server connections to "..host..".")
 							cert_ok = false
 						end
 					end
diff -r 45d28235ebe0 -r 843fe134453e util/dataforms.lua
--- a/util/dataforms.lua	Sat May 28 12:51:12 2016 +0200
+++ b/util/dataforms.lua	Mon May 30 13:17:28 2016 +0200
@@ -72,7 +72,7 @@
 				for _, val in ipairs(field.options or value) do
 					if type(val) == "table" then
 						form:tag("option", { label = val.label }):tag("value"):text(val.value):up():up();
-						if value == val.value or field.options and val.default and (not has_default) then
+						if value == val.value or val.default and (not has_default) then
 							form:tag("value"):text(val.value):up();
 							has_default = true;
 						end