From 1951d6fdcd4ce3dd5dcab4467511c2a9fd2ad3ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannes=20H=C3=B6ke?= <jhoeke@uni-bremen.de>
Date: Mon, 29 May 2017 21:24:12 +0200
Subject: [PATCH] Bump version to v6.0.2

---
 CHANGES.rst         | 8 +++++++-
 docs/source/conf.py | 2 +-
 telegram/version.py | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b78cfb3a8..b05fc3dc5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,7 +2,13 @@
 Changes
 =======
 
-**2017-05-21**
+**2017-05-29**
+
+*Released 6.0.2*
+
+- Avoid confusion with user's ``urllib3`` by renaming vendored ``urllib3`` to ``ptb_urllib3``
+
+**2017-05-19**
 
 *Released 6.0.1*
 
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 5b6085bb6..d80714c0b 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -61,7 +61,7 @@ author = u'Leandro Toledo'
 # The short X.Y version.
 version = '6.0'  # telegram.__version__[:3]
 # The full version, including alpha/beta/rc tags.
-release = '6.0.1'  # telegram.__version__
+release = '6.0.2'  # telegram.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/telegram/version.py b/telegram/version.py
index 28765e8a3..5bf5f688e 100644
--- a/telegram/version.py
+++ b/telegram/version.py
@@ -17,4 +17,4 @@
 # You should have received a copy of the GNU Lesser Public License
 # along with this program.  If not, see [http://www.gnu.org/licenses/].
 
-__version__ = '6.0.1'
+__version__ = '6.0.2'