From: Glenn Morris <rgm@gnu.org>
Date: Sun, 22 Mar 2015 18:11:27 +0000 (-0700)
Subject: ChangeLog fix
X-Git-Tag: emacs-24.5-rc1~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a4ff05a;p=emacs.git

ChangeLog fix
No need to merge to trunk, since it corrects a backported entry that
should not appear in trunk.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 060486b4ab3..d09b9de34fa 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,7 @@
-2015-03-22  John F Carr <jfc@mit.edu>
+2015-03-22  John F Carr  <jfc@mit.edu>  (tiny change)
 
 	* fontset.c (fontset_pattern_regexp): Backport: Replace + 1 with
-	+ 3 in alloca (Bug#20156) (tiny change)
+	+ 3 in alloca (Bug#20156).
 
 2015-03-12  Glenn Morris  <rgm@gnu.org>