From 03aca9ea79897a5c5f4eccbf74faa0c8c575fd40 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 28 Sep 2015 14:17:58 +0200
Subject: [PATCH] add changelog entry for fix #1073

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

diff --git a/CHANGELOG b/CHANGELOG
index 864c211b0..771de3f4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
 2.8.1.dev
 ---------
 
+- fix issue #1073: avoid calling __getattr__ on potential plugin objects.
+  This fixes an incompatibility with pytest-django.  Thanks Andreas Pelme,
+  Bruno Oliveira and Ronny Pfannschmidt for contributing and Holger Krekel
+  for the fix.
+
 - Fix issue #704: handle versionconflict during plugin loading more
   gracefully.  Thanks Bruno Oliveira for the PR.