Merge branch 'develop' into develop-1.1

2011-12-31 01:29:12 -05:00
parent d817d64c65 03bc38f7e3
commit e0545bf0bc
17 changed files with 221 additions and 21 deletions
--- a/sleekxmpp/xmlstream/stanzabase.py
+++ b/sleekxmpp/xmlstream/stanzabase.py
@@ -167,7 +167,7 @@ class ElementBase(object):
    #: For :class:`ElementBase` subclasses which are intended to be used
    #: as plugins, the ``plugin_attrib`` value defines the plugin name.
    #: Plugins may be accessed by using the ``plugin_attrib`` value as
-    #: the interface. An example using ``plugin_attrib = 'foo'``:
+    #: the interface. An example using ``plugin_attrib = 'foo'``::
    #:
    #:     register_stanza_plugin(Message, FooPlugin)
    #:     msg = Message()