From c62ed0cd935bfee474e9661fb51013f20ad07663 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Wed, 6 Oct 2010 16:26:55 +0200
Subject: [PATCH] fix changelog

--HG--
branch : trunk
---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 6b622742e..a81506368 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes between 1.3.4 and 1.4.0.dev0
 ==================================================
 
+- fix issue126 - introduce py.test.set_trace() to trace execution via
+  PDB during the running of tests even if capturing is ongoing.
 - fix issue123 - new "python -m py.test" invocation for py.test
   (requires Python 2.5 or above)
 - fix issue124 - make reporting more resilient against tests opening