Merge branch 'master' into testing

This commit is contained in:
Leandro Toledo 2015-09-20 12:34:02 -03:00
commit 3024c1ce3d

View file

@ -20,7 +20,7 @@ setup(
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*']),