From 2ff916cbc27dc7c242ff97d31419866d41f62e2c Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 27 May 2011 12:58:54 -0700
Subject: [PATCH] Fix order of ChangeLog entries after merge.

---
 src/ChangeLog | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index de7b3506abc..55ee4815149 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,3 @@
-2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-	* xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
-
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Integer overflow fixes.
@@ -84,6 +80,10 @@
 	a character than a buffer op, so better that it's in character.c.
 	* fns.c, print.c: Adjust to above changes.
 
+2011-05-27  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* xselect.c (x_convert_selection): Yet another int/Lisp_Object mixup.
+
 2011-05-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* xselect.c: Fix minor problems prompted by GCC 4.6.0 warnings.
-- 
2.11.4.GIT