From 8e0589af6912c392bfd3fab2868105e7d353813e Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 23 Jun 2015 09:47:07 +0200
Subject: [PATCH] Add changelog entry.

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

diff --git a/CHANGELOG b/CHANGELOG
index 824501c8b..5261f20f7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -65,6 +65,8 @@
 - fix issue741: make running output from testdir.run copy/pasteable
   Thanks Bruno Oliveira.
 
+- add a new ``--noconftest`` argument which ignores all ``conftest.py`` files.
+
 2.7.2 (compared to 2.7.1)
 -----------------------------