From: Glenn Morris <rgm@gnu.org>
Date: Thu, 5 Jan 2012 07:49:56 +0000 (-0800)
Subject: ChangeLog fixes.
X-Git-Tag: emacs-pretest-24.0.93~97^2~55^2~43
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2057c0404ec830cb420494a00563e3f547f92bb2;p=emacs.git

ChangeLog fixes.
---

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6c45376b671..a40e203681b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -12,13 +12,17 @@
 	* refcards/vipcard.tex, refcards/viperCard.tex:
 	Update short copyright year to 2012.
 
-2012-01-03  Bastien Guerry  <bzg@altern.org>
+2012-01-04 Chong Yidong  <cyd@stupidchicken.com>
 
-	* org/COPYRIGHT-AND-LICENSE: New file.
+	* org/README: Rename from COPYRIGHT-AND-LICENSE.
+
+2012-01-03  Jambunathan K  <kjambunathan@gmail.com>
 
-	* org/OrgOdtContentTemplate.xml: New file.
+	* org/OrgOdtContentTemplate.xml, org/OrgOdtStyles.xml: New files.
 
-	* org/OrgOdtStyles.xml: New file.
+2012-01-03  Bastien Guerry  <bzg@altern.org>
+
+	* org/COPYRIGHT-AND-LICENSE: New file.
 
 	* org/: New directory.