Merge from waqas

diff --cc util/stanza.lua
index a4a8919152e8171719e256443e0a290fd1ab88eb,dd05ddaba440878a186fe2596af658b310bbfe67..6af7e2b22e386b3ff045bea23c5badc0b7d39463
--- 1/util/stanza.lua
--- 2/util/stanza.lua
+++ b/util/stanza.lua
@@@ -19,8 -19,8 +19,9 @@@
  
  
  local t_insert      =  table.insert;
 +local t_concat      =  table.concat;
  local t_remove      =  table.remove;
+ local t_concat      =  table.concat;
  local s_format      = string.format;
  local tostring      =      tostring;
  local setmetatable  =  setmetatable;