From 1b6bc4d606a98d88b332a5e380af64ac92c2d610 Mon Sep 17 00:00:00 2001
From: Raphael Pierzina <raphael@hackebrot.de>
Date: Sat, 25 Jun 2016 14:58:18 +0200
Subject: [PATCH] Add feature proposal to changelog

---
 CHANGELOG.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d95d66384..01c214ca6 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -106,6 +106,9 @@
   Thanks `@Vogtinator`_ for reporting. Thanks to `@RedBeardCode`_ and
   `@tomviner`_ for PR.
 
+* Add proposal to docs for a new feature that enables users to combine multiple
+  fixtures into one. Thanks to `@hpk42`_ and `@hackebrot`_.
+
 *
 
 .. _#1580: https://github.com/pytest-dev/pytest/pull/1580