From 01ae5dbb2e3a6faae7699eb14bc4b7c4587aa75d Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 16 Dec 2013 08:04:46 +0100
Subject: [PATCH] amend CHANGELOG with credits and issue mentioning

---
 CHANGELOG | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 588e28bbf..30d48a2fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,10 +1,16 @@
 Unreleased
 -----------------------------------
 
+- fix issue403: allow parametrize of multiple same-name functions within
+  a collection node.  Thanks Andreas Kloeckner and Alex Gaynor for reporting
+  and analysis.
+
 - Allow parameterized fixtures to specify the ID of the parameters by
   adding an ids argument to pytest.fixture() and pytest.yield_fixture().
+  Thanks Floris Bruynooghe. 
 
-- fix issue404 by always using the binary xml escape in the junitxml plugin
+- fix issue404 by always using the binary xml escape in the junitxml
+  plugin.  Thanks Ronny Pfannschmidt.
 
 2.5.0
 -----------------------------------