Merge branch 'master' into json-sessions

This commit is contained in:
Armin Ronacher 2012-08-11 02:37:21 +01:00
commit 1740d7c51a
2 changed files with 2 additions and 2 deletions

View file

@ -10,7 +10,7 @@
:license: BSD, see LICENSE for more details.
"""
__version__ = '0.9'
__version__ = '0.10-dev'
# utilities we import from Werkzeug and Jinja2 that are unused
# in the module but are exported as public interface.

View file

@ -77,7 +77,7 @@ class run_audit(Command):
setup(
name='Flask',
version='0.9',
version='0.10-dev',
url='http://github.com/mitsuhiko/flask/',
license='BSD',
author='Armin Ronacher',