Merge branch 'master' into develop

This commit is contained in:
Lance Stout 2012-06-20 21:13:06 -07:00
commit 546066d677
2 changed files with 3 additions and 3 deletions

View file

@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github
``develop`` branch.
**Latest Release**
- `1.1.5 <http://github.com/fritzy/SleekXMPP/zipball/1.1.5>`_
- `1.1.6 <http://github.com/fritzy/SleekXMPP/zipball/1.1.6>`_
**Develop Releases**
- `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_

View file

@ -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.5'
__version_info__ = (1, 1, 5, '', 0)
__version__ = '1.1.6'
__version_info__ = (1, 1, 6, '', 0)