Merge from origin/emacs-24

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 814b94dde0891519400ca67f39dbf6e753f6e7fc..f94db9aa571d584593f910176b0be22eadc19370 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-27  Álvar Ibeas  <ibeas@gmx.com>  (tiny change)
+
+       * tutorials/TUTORIAL.es: Improve style consistency.  Spelling fixes.
+
+2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
 2014-12-25  Karl Fogel  <kfogel@red-bean.com>
 
        * NEWS: Mention new buffer display behavior for `shell'.