Merge upstream Org (from commit acbbe2)

[bpt/emacs.git] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 3ebe18b..60d4a7a 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-26  Nicolas Goaziou  <n.goaziou@gmail.com>
+
+       * refcards/orgcard.tex: Fix keybindings about
+       `org-show-todo-tree'.
+
 2012-10-23  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix outdated timestamp documentation in Elisp manual (bug#12706).