Merge from trunk.

[bpt/emacs.git] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index e54e8d8..6d89746 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-30  Chong Yidong  <cyd@stupidchicken.com>
+
+       * grammars: New directory.
+
 2011-07-28  Andreas Schwab  <schwab@linux-m68k.org>
 
        * NEWS: Document ## and #:.