Merge branch 'master' into develop

2013-01-16 16:26:35 -08:00 · 2013-01-16 16:26:35 -08:00 · 1dbfa29a1e
commit 1dbfa29a1e
parent a0266dac6f 6bac4741f6
1 changed files with 1 additions and 1 deletions
--- a/sleekxmpp/plugins/xep_0048/stanza.py
+++ b/sleekxmpp/plugins/xep_0048/stanza.py
@ -50,7 +50,7 @@ class Conference(ElementBase):
    def set_autojoin(self, value):
        del self['autojoin']
        if value in ('1', 'true', True):
-            self._set_sub_text('autojoin', 'true')
+            self._set_attr('autojoin', 'true')


 class URL(ElementBase):