# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1427494784 0
# Node ID b6e558febb7af6605b744d4d623e73df0e510e7e
# Parent  64e6b88b6b21ef6f6af4aa37cb7971d247d3fbdd# Parent  03a43bf3ecd2bce6da11f155d5b0880d94451c43
Merge with merge merge merge

diff -r 64e6b88b6b21 -r b6e558febb7a net/http/server.lua
diff -r 64e6b88b6b21 -r b6e558febb7a plugins/mod_s2s/mod_s2s.lua
--- a/plugins/mod_s2s/mod_s2s.lua	Fri Mar 27 22:11:58 2015 +0000
+++ b/plugins/mod_s2s/mod_s2s.lua	Fri Mar 27 22:19:44 2015 +0000
@@ -499,6 +499,12 @@
 	if not from or (hosts[from] and hosts[from].modules.dialback) then
 		attr["xmlns:db"] = 'jabber:server:dialback';
 	end
+	if not from then
+		attr.from = '';
+	end
+	if not to then
+		attr.to = '';
+	end
 end
 
 -- Session initialization logic shared by incoming and outgoing
diff -r 64e6b88b6b21 -r b6e558febb7a util-src/encodings.c
--- a/util-src/encodings.c	Fri Mar 27 22:11:58 2015 +0000
+++ b/util-src/encodings.c	Fri Mar 27 22:19:44 2015 +0000
@@ -475,7 +475,6 @@
 	luaL_register(L, NULL, Reg_utf8);
 	lua_setfield(L, -2, "utf8");
 
-	lua_pushliteral(L, "version");			/** version */
 	lua_pushliteral(L, "-3.14");
 	lua_setfield(L, -2, "version");
 	return 1;