Merge branch 'master' into testing

leandrotoledo · leandrotoledo · commit 3024c1ce3d91 · 2015-09-20T12:34:02.000-03:00
diff --git a/setup.py b/setup.py
@@ -20,7 +20,7 @@ def read(*paths):
     author_email='leandrotoledodesouza@gmail.com',
     license='LGPLv3',
     url='https://github.com/leandrotoledo/python-telegram-bot',
-    keywords='telegram bot api',
+    keywords='python telegram bot api wrapper',
     description='A Python wrapper around the Telegram Bot API',
     long_description=(read('README.rst')),
     packages=find_packages(exclude=['tests*']),
