From 0e916460d85200d59e5ce855140d68a772a74cf2 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Sat, 4 Apr 2015 16:29:38 +0200
Subject: [PATCH] add changelog entries

--HG--
branch : pytest-2.7
---
 CHANGELOG | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 464531ad9..e83fae916 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,10 @@
 
 - streamlined and documented release process.  Also all versions
   (in setup.py and documentation generation) are now read
-  from _pytest/__init__.py.
+  from _pytest/__init__.py. Thanks Holger Krekel.
+
+- fixed docs to remove the notion that yield-fixtures are experimental.
+  They are here to stay :)  Thanks Bruno Oliveira.
 
 2.7.0 (compared to 2.6.4)
 -----------------------------