From f176ee3a1c752fa29dfb4963ea47350e4c47ca49 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sun, 17 Jun 2012 11:01:14 +0200
Subject: [PATCH] (correction-commit for wrong previous changelog message) fix
 issue159 -- improve http://pytest.org/latest/faq.html especially with respect
 to the "magic" history, also mention pytest-django, trial and unittest
 integration.

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fd49778f9..965089c85 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@ Changes between 2.2.4 and 2.2.5.dev
 - fix issue128: show captured output when capsys/capfd are used
 - pluginmanager.register(...) now raises ValueError if the
   plugin has been already registered or the name is taken
-- fix issue129: improve http://pytest.org/latest/faq.html 
+- fix issue159: improve http://pytest.org/latest/faq.html 
   especially with respect to the "magic" history, also mention
   pytest-django, trial and unittest integration.