Merge branch 'master' into develop

2012-10-31 00:17:26 -07:00
parent 06a690a259 12e8bb6ddc
commit a00eee1bbe
3 changed files with 16 additions and 16 deletions
--- a/sleekxmpp/plugins/xep_0047/stanza.py
+++ b/sleekxmpp/plugins/xep_0047/stanza.py
@@ -14,7 +14,7 @@ def to_b64(data):


 def from_b64(data):
-    return bytes(base64.b64decode(bytes(data))).decode('utf-8')
+    return bytes(base64.b64decode(bytes(data)))


 class Open(ElementBase):