From 4e034b61bc2747a99efd5a935d3b3be2a262803f Mon Sep 17 00:00:00 2001
From: Andreas Pelme <andreas@pelme.se>
Date: Thu, 28 Mar 2013 11:49:58 +0100
Subject: [PATCH] 2.2.1 release

---
 docs/changelog.rst        | 7 +++++++
 pytest_django/__init__.py | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 7e7edcc56..562cb3282 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2.2.1
+-----
+
+* Fixed an issue with the settings fixture when used in combination with
+  django-appconf. It now uses pytest's monkeypatch internally and should
+  be more robust.
+
 2.2.0
 -----
 
diff --git a/pytest_django/__init__.py b/pytest_django/__init__.py
index 04188a16d..36a511eca 100644
--- a/pytest_django/__init__.py
+++ b/pytest_django/__init__.py
@@ -1 +1 @@
-__version__ = '2.2.0'
+__version__ = '2.2.1'