summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-10-31 13:55:49 -0700
committerLance Stout <lancestout@gmail.com>2012-10-31 13:55:49 -0700
commitf3f543b31e0c6788b26d1f450db5e9642b31ee57 (patch)
treecccb5c76d6a3554019d6f2719506e75562c90d03 /sleekxmpp
parent4b7ec4a32ac15dfa35b3282793a8317cfd32837b (diff)
parent0fea4262ea396a81926cebc2be39afdbb7129396 (diff)
downloadslixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.gz
slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.bz2
slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.xz
slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/version.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py
index 010f425b..8f83adb3 100644
--- a/sleekxmpp/version.py
+++ b/sleekxmpp/version.py
@@ -9,5 +9,5 @@
# We don't want to have to import the entire library
# just to get the version info for setup.py
-__version__ = '1.1.10'
-__version_info__ = (1, 1, 10, '', 0)
+__version__ = '1.1.11'
+__version_info__ = (1, 1, 11, '', 0)