diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-12-17 13:50:33 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-12-17 13:50:33 +0000 |
| commit | 8ee0fb71fcba10a54760d4a047a4a91e2ab97ad1 (patch) | |
| tree | 08ff2f81be281c7d1f399e2e3ff5b74f1671b77b /util/stanza.lua | |
| parent | c1efda1ffd82e6988ab20b4be5f75ecf31fb551e (diff) | |
| parent | 07e945631dc2abe7a2afe204919a72d25398c687 (diff) | |
| download | prosody-8ee0fb71fcba10a54760d4a047a4a91e2ab97ad1.tar.gz prosody-8ee0fb71fcba10a54760d4a047a4a91e2ab97ad1.zip | |
Merge Tobias->trunk
Diffstat (limited to 'util/stanza.lua')
| -rw-r--r-- | util/stanza.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/stanza.lua b/util/stanza.lua index 307a858a..16d558af 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -254,7 +254,7 @@ function stanza_mt.get_error(stanza) end end end - return type, condition or "undefined-condition", text or ""; + return type, condition or "undefined-condition", text; end function stanza_mt.__add(s1, s2) |