From 322c96eec22c23a884b4dee392c4f26ce2ff3142 Mon Sep 17 00:00:00 2001
From: Bryan Veloso <bryan@revyver.com>
Date: Sat, 28 Apr 2012 11:32:22 -0700
Subject: [PATCH] Merge branch 'release/2.0.1' into develop

* release/2.0.1:
  Bumping the version number.
  Changelog update.
---
 docs/changelog.rst   | 6 ++++++
 docs/conf.py         | 4 ++--
 imagekit/__init__.py | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 9257870..34d3ef7 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,12 @@
 Changelog
 =========
 
+v2.0.1
+------
+
+- Fixed a file descriptor leak in the `utils.quiet()` context manager.
+
+
 v2.0.0
 ------
 
diff --git a/docs/conf.py b/docs/conf.py
index 1ba36ca..580401c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -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.
diff --git a/imagekit/__init__.py b/imagekit/__init__.py
index d525af2..55a5d04 100644
--- a/imagekit/__init__.py
+++ b/imagekit/__init__.py
@@ -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'