Merge branch 'master' into develop

2013-01-04 03:00:43 -08:00
parent ef76f923ad 6c0afb87b9
commit 0e7486d7b4
7 changed files with 164 additions and 4 deletions
--- a/sleekxmpp/plugins/init.py
+++ b/sleekxmpp/plugins/init.py
@@ -25,6 +25,7 @@ __all__ = [
    'xep_0033',  # Extended Stanza Addresses
    'xep_0045',  # Multi-User Chat (Client)
    'xep_0047',  # In-Band Bytestreams
+    'xep_0048',  # Bookmarks
    'xep_0049',  # Private XML Storage
    'xep_0050',  # Ad-hoc Commands
    'xep_0054',  # vcard-temp