diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-13 09:27:47 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-13 09:27:47 -0700 |
| commit | f89df6e70cee5840dbdbf41e68ae7d2384814373 (patch) | |
| tree | dff0d3315c117ecba12fdc2837dd3ed6fad01b86 /sleekxmpp/version.py | |
| parent | 250d28e870b63576e09dd1288b05394808518369 (diff) | |
| parent | 0e36a0135407ea9a274517c7cfd5fe32eda0491f (diff) | |
| download | slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.gz slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.bz2 slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.tar.xz slixmpp-f89df6e70cee5840dbdbf41e68ae7d2384814373.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/version.py')
| -rw-r--r-- | sleekxmpp/version.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py index 37c2875e..ec793dd8 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.3' -__version_info__ = (1, 1, 3, '', 0) +__version__ = '1.1.4' +__version_info__ = (1, 1, 4, '', 0) |