Merge fix.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 68d957584c64e375311ef882127e67ecf3d6d495..5f0908e11c6098075eb67a779e0033be139196e1 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,14 +1,3 @@
-2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
-
-       * org.el (org-maybe-keyword-time-regexp):
-       * org-icalendar.el (org-icalendar-store-UID):
-       * org-agenda.el (org-agenda-scheduled-leaders)
-       (org-agenda-deadline-leaders, org-agenda-filter-preset):
-       * org-table.el (org-table-current-line-types)
-       (org-table-current-begin-line, org-table-current-begin-pos):
-       (org-table-current-field-formula):
-       Fix typos in docstrings.
-
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * org-remember.el (org-remember-mode-map):