Merged upstream/master

This commit is contained in:
icyleaf 2013-09-17 22:47:42 +08:00
commit d52fb7c08f
160 changed files with 5122 additions and 3216 deletions

View file

@ -1,8 +1,8 @@
#!/usr/bin/env python
from setuptools import setup
requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.6', 'pygments', 'docutils',
'pytz', 'blinker', 'unidecode', 'six']
requires = ['feedgenerator >= 1.6', 'jinja2 >= 2.7', 'pygments', 'docutils',
'pytz >= 0a', 'blinker', 'unidecode', 'six']
entry_points = {
'console_scripts': [