From a08c2161a7be82b849a5d3aa765a65cf0a6661e7 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 15 Jun 2012 15:29:53 -0700
Subject: Ensure that ssl_invalid_cert returns PEM formatted certifcate data.

---
 sleekxmpp/xmlstream/xmlstream.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index c0d02e9b..40ae38c9 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -534,7 +534,7 @@ class XMLStream(object):
                         if not self.event_handled('ssl_invalid_cert'):
                             self.disconnect(send_close=False)
                         else:
-                            self.event('ssl_invalid_cert', cert, direct=True)
+                            self.event('ssl_invalid_cert', pem_cert, direct=True)
 
             self.set_socket(self.socket, ignore=True)
             #this event is where you should set your application state
@@ -821,7 +821,7 @@ class XMLStream(object):
                 if not self.event_handled('ssl_invalid_cert'):
                     self.disconnect(self.auto_reconnect, send_close=False)
                 else:
-                    self.event('ssl_invalid_cert', cert, direct=True)
+                    self.event('ssl_invalid_cert', pem_cert, direct=True)
 
             self.set_socket(self.socket)
             return True
-- 
cgit v1.2.3


From ee702f40710219290508f95ac01df50a96d04f3c Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 15 Jun 2012 15:36:01 -0700
Subject: Bump version to 1.1.5

---
 README.rst           | 2 +-
 sleekxmpp/version.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 9b0b2f5b..427ae960 100644
--- a/README.rst
+++ b/README.rst
@@ -45,7 +45,7 @@ The latest source code for SleekXMPP may be found on `Github
 ``develop`` branch.
 
 **Latest Release**
-    - `1.1.4 <http://github.com/fritzy/SleekXMPP/zipball/1.1.4>`_
+    - `1.1.5 <http://github.com/fritzy/SleekXMPP/zipball/1.1.5>`_
 
 **Develop Releases**
     - `Latest Develop Version <http://github.com/fritzy/SleekXMPP/zipball/develop>`_
diff --git a/sleekxmpp/version.py b/sleekxmpp/version.py
index ec793dd8..7970c3b5 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.4'
-__version_info__ = (1, 1, 4, '', 0)
+__version__ = '1.1.5'
+__version_info__ = (1, 1, 5, '', 0)
-- 
cgit v1.2.3