# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1441316955 -7200
# Node ID 621384d89a44528af13233ea8e8cc2486c998a29
# Parent  40d50c23956467973efb82ba03c7f4281af4ffbc# Parent  5de30376bf98575127d6cd94627a1c2ed1c57e64
Merge 0.10->trunk

diff -r 40d50c239564 -r 621384d89a44 util/stanza.lua
--- a/util/stanza.lua	Thu Sep 03 16:43:46 2015 +0100
+++ b/util/stanza.lua	Thu Sep 03 23:49:15 2015 +0200
@@ -427,4 +427,5 @@
 	reply = reply;
 	error_reply = error_reply;
 	presence = presence;
+	xml_escape = xml_escape;
 };