diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-01-22 22:55:49 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-01-22 22:55:49 +0000 |
commit | 31c2d43e55f9cee309d9feeaca3ff53ceb66ceef (patch) | |
tree | acc1b9c5576f0ba21b56fd5b133a4a173798d042 /util/stanza.lua | |
parent | 76628c7453e56d5e156214c142ca05f9908c0191 (diff) | |
parent | 8292f713bab8e71624f03111115bd3a97cf8dae9 (diff) | |
download | prosody-31c2d43e55f9cee309d9feeaca3ff53ceb66ceef.tar.gz prosody-31c2d43e55f9cee309d9feeaca3ff53ceb66ceef.zip |
Merge with trunk
Diffstat (limited to 'util/stanza.lua')
-rw-r--r-- | util/stanza.lua | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/util/stanza.lua b/util/stanza.lua index de83977f..600212a4 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -258,11 +258,6 @@ function stanza_mt.get_error(stanza) return type, condition or "undefined-condition", text; end -function stanza_mt.__add(s1, s2) - return s1:add_direct_child(s2); -end - - do local id = 0; function new_id() |