Merge branch 'master' into develop

2013-01-21 02:34:22 -08:00
parent 648f3f978a 4f9a95b011
commit bad405bea9
22 changed files with 659 additions and 827 deletions
--- a/sleekxmpp/plugins/init.py
+++ b/sleekxmpp/plugins/init.py
@@ -12,7 +12,7 @@ from sleekxmpp.plugins.base import register_plugin, load_plugin

 __all__ = [
    # Non-standard
-    'gmail_notify',  # Gmail searching and notifications
+    'gmail',     # Gmail searching and notifications

    # XEPS
    'xep_0004',  # Data Forms