From b0837693d0f892b2fa54fe61b3def33498b29d21 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Thu, 3 Apr 2014 10:04:09 +0200
Subject: [PATCH] add some changelog entries

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

diff --git a/CHANGELOG b/CHANGELOG
index 0e6a60f8b..80861e8ac 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,6 +50,11 @@ NEXT (2.6)
 
 - fix issue486: better reporting and handling of early conftest loading failures
 
+- some cleanup and simplification of internal conftest handling.
+
+- work a bit harder to break reference cycles when catching exceptions.
+  Thanks Jurko Gospodnetic.
+
 
 2.5.2
 -----------------------------------