summaryrefslogtreecommitdiff
path: root/sleekxmpp/version.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-06-09 11:43:06 -0700
committerLance Stout <lancestout@gmail.com>2012-06-09 11:43:06 -0700
commitdaa73a3f3c793014c653a3d08c5f8af5600170da (patch)
tree10d9478401e6ff0733e682a6785427131ddf768a /sleekxmpp/version.py
parent0b51afe87abf882fd74d18fe231458e33c949dd5 (diff)
parent6997261c6b3479260465a6c829a21152f9019b4d (diff)
downloadslixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.tar.gz
slixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.tar.bz2
slixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.tar.xz
slixmpp-daa73a3f3c793014c653a3d08c5f8af5600170da.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/version.py')
-rw-r--r--sleekxmpp/version.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py
index 04aa3d59..37c2875e 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.2'
-__version_info__ = (1, 1, 2, '', 0)
+__version__ = '1.1.3'
+__version_info__ = (1, 1, 3, '', 0)