summaryrefslogtreecommitdiff
path: root/sleekxmpp/__init__.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-07-27 19:36:04 -0700
committerLance Stout <lancestout@gmail.com>2011-07-27 19:36:04 -0700
commitd7fe724145c2e01d1028dab773fb49414c6856dd (patch)
tree460331e5949b92637c79275aed001c85125f7afe /sleekxmpp/__init__.py
parent20df6348a4c8262a40578d84c934f9a15431d925 (diff)
parente022b2a36c342b6a83d7c7f0a39dfb851cdfd2de (diff)
downloadslixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.tar.gz
slixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.tar.bz2
slixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.tar.xz
slixmpp-d7fe724145c2e01d1028dab773fb49414c6856dd.zip
Merge branch 'develop' into exceptions
Diffstat (limited to 'sleekxmpp/__init__.py')
-rw-r--r--sleekxmpp/__init__.py4
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)