From 187c3508059524a86ad715a5a209fff2d22751ce Mon Sep 17 00:00:00 2001
From: mathieui <mathieui@mathieui.net>
Date: Sun, 2 Oct 2016 17:36:14 +0200
Subject: [PATCH] Update for slixmpp 1.2

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

diff --git a/README.rst b/README.rst
index 0b14512f..1fac8dd9 100644
--- a/README.rst
+++ b/README.rst
@@ -12,8 +12,8 @@ Building
 --------
 
 Slixmpp can make use of cython to improve performance on critical modules.
-To do that, cython3 is necessary along with libidn headers. Otherwise,
-no compilation is needed. Building is done by running setup.py::
+To do that, **cython3** is necessary along with **libidn** headers.
+Otherwise, no compilation is needed. Building is done by running setup.py::
 
     python3 setup.py build_ext --inplace
 
@@ -108,6 +108,11 @@ Slixmpp Credits
 
 **Contributors:**
     - Emmanuel Gil Peyrot (`Link mauve <xmpp:linkmauve@linkmauve.fr?message>`_)
+    - Sam Whited (`Sam Whited <mailto:sam@samwhited.com>`_)
+    - Dan Sully (`Dan Sully <mailto:daniel@electricalrain.com>`_)
+    - Gasper Zejn (`Gasper Zejn <mailto:zejn@kiberpipa.org>`_)
+    - Krzysztof Kotlenga (`Krzysztof Kotlenga <mailto:pocek@users.sf.net>`_)
+    - Tsukasa Hiiragi (`Tsukasa Hiiragi <mailto:bakalolka@gmail.com>`_)
 
 Credits (SleekXMPP)
 -------------------
diff --git a/slixmpp/version.py b/slixmpp/version.py
index dfa46ba3..3ccdff42 100644
--- a/slixmpp/version.py
+++ b/slixmpp/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'
-__version_info__ = (1, 1)
+__version__ = '1.2'
+__version_info__ = (1, 2)