From c6533a2d69a0045b2b5de68b0afe8796c00a120e Mon Sep 17 00:00:00 2001
From: Leandro Toledo <leandrotoledodesouza@gmail.com>
Date: Tue, 10 Nov 2015 12:21:04 -0200
Subject: [PATCH] Releasing v2.9

---
 CHANGES.rst         | 19 ++++++++-----------
 docs/source/conf.py |  4 ++--
 setup.py            |  2 +-
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 607c245c5..777cf6adf 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+2015-11-10
+  Released 2.9
+  Emoji class now uses bytes_to_native_str from future 3rd party lib
+  Make user_from optional to work with channels channels
+  Raise exception if Telegram times out on long-polling
+  *Special thanks to @jh0ker for all hard work*
+
+
 2015-10-08
   Released 2.8.7
   Type as optional for GroupChat class
@@ -121,7 +129,6 @@
 
 
 2015-07-19
-
   Released 2.0
   Fixes bugs
   Improves __str__ over to_json()
@@ -129,51 +136,43 @@
 
 
 2015-07-15
-
   Released 1.9
   Python 3 officially supported
   PEP8 improvements
 
 
 2015-07-12
-
   Released 1.8
   Fixes crash when replying an unicode text message (special thanks to JRoot3D)
 
 
 2015-07-11
-
   Released 1.7
   Fixes crash when username is not defined on chat (special thanks to JRoot3D)
 
 
 2015-07-10
-
   Released 1.6
   Improvements for GAE support
 
 
 2015-07-10
-
   Released 1.5
   Fixes randomly unicode issues when using InputFile
 
 
 2015-07-10
-
   Released 1.4
   requests lib is no longer required
   Google App Engine (GAE) is supported
 
 
 2015-07-10
-
   Released 1.3
   Added support to setWebhook (special thanks to macrojames)
 
 
 2015-07-09
-
   Released 1.2
   CustomKeyboard classes now available
   Emojis available
@@ -181,12 +180,10 @@
 
 
 2015-07-08
-
   Released 1.1
   PyPi package now available
 
 
 2015-07-08
-
   Released 1.0
   Initial checkin of python-telegram-bot
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 70bfa0556..45c3a7849 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -58,9 +58,9 @@ author = u'Leandro Toledo'
 # built documents.
 #
 # The short X.Y version.
-version = '2.8'
+version = '2.9'
 # The full version, including alpha/beta/rc tags.
-release = '2.8.7'
+release = '2.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 4fc0b4a30..f24cd0251 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ def read(*paths):
 
 setup(
     name='python-telegram-bot',
-    version='2.8.7',
+    version='2.9',
     author='Leandro Toledo',
     author_email='leandrotoledodesouza@gmail.com',
     license='LGPLv3',