From da52304a6e6ef96ec390ce29d0d99c98adbb7187 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Mon, 28 Jun 2010 11:26:19 +0200
Subject: [PATCH] adjust changelog, add fixed issue92

--HG--
branch : trunk
---
 CHANGELOG | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d3478b8af..c3c1b2ab4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,7 +13,7 @@ New features
     with py.test.raises(RuntimeError) as excinfo:
         call_something()
 
-    # do extra checks on excinfo.value|type|traceback objects 
+    # you may do extra checks on excinfo.value|type|traceback here
 
   (thanks Ronny Pfannschmidt) 
 
@@ -21,8 +21,8 @@ New features
   to all reports in the junitxml file. 
 
 - Funcarg factories can now dynamically apply a marker to a 
-  test invocation.  This is particularly useful if a factory
-  provides parameters to a test which you expect-to-fail:
+  test invocation.  This is for example useful if a factory
+  provides parameters to a test which are expected-to-fail: 
 
     def pytest_funcarg__arg(request):
         request.applymarker(py.test.mark.xfail(reason="flaky config"))
@@ -40,6 +40,7 @@ Bug fixes / Maintenance
 - fix issue105 assignment on the same line as a failing assertion
 - fix issue104 proper escaping for test names in junitxml plugin
 - fix issue57 -f|--looponfail to work with xpassing tests
+- fix issue92 collectonly reporter and --pastebin
 - fix py.code.compile(source) to generate unique filenames 
 - fix assertion re-interp problems on PyPy, by defering code 
   compilation to the (overridable) Frame.eval class.