From d0d4759c961e5343633ee5af906d93040b176d7b Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 24 Oct 2014 17:19:54 +0200
Subject: [PATCH] fix changelog -- we should have all changes in trunk that are
 in 2.6.4

---
 CHANGELOG | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 91154b4f6..accddb70d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
-2.7.0.dev
-----------
+2.7.0.dev (compared to 2.6.4)
+-----------------------------
 
 - implement issue351: add ability to specify parametrize ids as a callable
   to generate custom test ids.  Thanks Brianna Laugher for the idea and
@@ -23,13 +23,12 @@
 - "python_classes" and "python_functions" options now support glob-patterns
  for test discovery, as discussed in issue600. Thanks Ldiary Translations.
 
-- fix issue614: fixed pastebin support.
 
-
-2.6.4.dev
+2.6.4
 ----------
 
-- Improve assertion failure reporting on iterables, by using ndiff and pprint.
+- Improve assertion failure reporting on iterables, by using ndiff and
+  pprint.
 
 - removed outdated japanese docs from source tree.
 
@@ -43,6 +42,11 @@
 
 - fix issue604: Escape % character in the assertion message.
 
+- fix issue620: add explanation in the --genscript target about what
+  the binary blob means. Thanks Dinu Gherman.
+
+- fix issue614: fixed pastebin support.
+
 2.6.3
 -----------