Merge branch 'release/2.0.1' into develop

* release/2.0.1:
  Bumping the version number.
  Changelog update.
This commit is contained in:
Bryan Veloso 2012-04-28 11:32:22 -07:00
parent ceadfb9712
commit 322c96eec2
3 changed files with 9 additions and 3 deletions

View file

@ -1,6 +1,12 @@
Changelog
=========
v2.0.1
------
- Fixed a file descriptor leak in the `utils.quiet()` context manager.
v2.0.0
------

View file

@ -50,9 +50,9 @@ copyright = u'2011, Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett &
# built documents.
#
# The short X.Y version.
version = '2.0.0'
version = '2.0.1'
# The full version, including alpha/beta/rc tags.
release = '2.0.0'
release = '2.0.1'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.

View file

@ -1,6 +1,6 @@
__title__ = 'django-imagekit'
__author__ = 'Justin Driscoll, Bryan Veloso, Greg Newman, Chris Drackett, Matthew Tretter, Eric Eldredge'
__version__ = (2, 0, 0, 'final', 0)
__version__ = (2, 0, 1, 'final', 0)
__license__ = 'BSD'