From c92467df2f75bf0f0201e5d183f79200519d6400 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 3 Jun 2015 23:39:00 +0200
Subject: [PATCH] add changelog for latest merge

---
 AUTHORS   | 1 +
 CHANGELOG | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/AUTHORS b/AUTHORS
index 3bdefb512..50092e398 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -49,3 +49,4 @@ Tom Viner
 Dave Hunt
 Charles Cloud
 Eduardo Schettino
+Florian Bruhin
diff --git a/CHANGELOG b/CHANGELOG
index f0124722d..936c94711 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,9 @@
   the test.  In all cases you get back a RunResult but the inprocess
   one will also have a "reprec" attribute with the recorded events/reports.
 
+- fix monkeypatch.setattr("x.y", raising=False) to actually not raise
+  if "y" is not a pre-existing attribute. Thanks Florian Bruhin.
+
  
 2.7.1 (compared to 2.7.0)
 -----------------------------