diff options
author | Lance Stout <lancestout@gmail.com> | 2011-08-03 17:02:33 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2011-08-03 17:02:33 -0700 |
commit | 3918ddb07517f944c6a5c10ee84efc47a6290b0e (patch) | |
tree | 267458135b7d619999af5fc456d970dc82e88f06 /sleekxmpp/__init__.py | |
parent | d4091dbde641dc9796b51e032ea23a0ba5c1fcbb (diff) | |
parent | ccc6ab128128990babbf63d4586cdd43384ae320 (diff) | |
download | slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.tar.gz slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.tar.bz2 slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.tar.xz slixmpp-3918ddb07517f944c6a5c10ee84efc47a6290b0e.zip |
Merge branch 'develop' into stream_features
Diffstat (limited to 'sleekxmpp/__init__.py')
-rw-r--r-- | sleekxmpp/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index 5ad11742..a53cfb0e 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -15,5 +15,5 @@ from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET -__version__ = '1.0beta5' -__version_info__ = (1, 0, 0, 'beta5', 0) +__version__ = '1.0beta6' +__version_info__ = (1, 0, 0, 'beta6', 0) |