From 84ab19451610959921c58966d2d1756efe16f9d9 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 26 Mar 2014 19:06:56 +0100
Subject: [PATCH] add changelog: merge PR123: improved integration with
 mock.patch decorator on tests.

---
 AUTHORS   | 1 +
 CHANGELOG | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index cd3082ee5..0254dbfdf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,3 +39,4 @@ Mark Abramowitz
 Piotr Banaszkiewicz
 Jurko Gospodnetić
 Marc Schlaich
+Christopher Gilling
diff --git a/CHANGELOG b/CHANGELOG
index 3bd2f3ae8..42feb6dc2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,8 @@ NEXT (2.6)
 - fix issue472: clarify that ``pytest.config.getvalue()`` cannot work
   if it's triggered ahead of command line parsing.
 
+- merge PR123: improved integration with mock.patch decorator on tests.
+
 
 2.5.2
 -----------------------------------