From 8dfd6c17e3fd10e09e019dd03b66b47dedef0540 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Tue, 14 Oct 2014 10:12:45 +0200
Subject: [PATCH] add changelog note for tom's PR about parametrized markers.

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 2d3d3bc4f..bfafc8d91 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,10 @@
 
 - add a doctest ini option for doctest flags, thanks Holger Peters.
 
+- add note to docs that if you want to mark a parameter and the
+  parameter is a callable, you also need to pass in a reason to disambiguate
+  it from the "decorator" case.  Thanks Tom Viner.
+
 2.6.4.dev
 ----------