From 9a8f59340b86151b183d6561a94b953371c3daf3 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Thu, 27 Jun 2013 22:00:27 +0200
Subject: unify duplicate CHANGELOG entry

---
 railties/CHANGELOG.md | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 43aed3f0e7..4e75cb8375 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -3,8 +3,9 @@
 *   Fix bugs that crashed `rake test:benchmark`, `rails profiler` and
     `rails benchmarker`.
     Fixes #4938.
+    Backport rails/rails-perftest#2.
 
-    *Yves Senn*
+    *Dmitry Vorotilin + Yves Senn*
 
 *   Add support for runner hook.
 
@@ -27,11 +28,6 @@
 
 *   No changes.
 
-*   Fix launching performance tests through rake `test:benchmark`.
-    Fixes #4938.
-    Backport rails/rails-perftest#2.
-
-    *Dmitry Vorotilin + Yves Senn*
 
 ## Rails 3.2.11 (Jan 8, 2013) ##
 
-- 
cgit v1.2.3