[Emacs-diffs] /srv/bzr/emacs/trunk r103498: Merge fix.

[Glenn Morris]

------------------------------------------------------------
revno: 103498
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-03-03 00:13:09 -0800
message:
  Merge fix.
modified:
  lisp/org/ChangeLog

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2011-02-28 01:07:29 +0000
+++ b/lisp/org/ChangeLog        2011-03-03 08:13:09 +0000
@@ -1,14 +1,3 @@
-2011-02-28  Juanma Barranquero  <address@hidden>
-
-       * 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  <address@hidden>
 
        * org-remember.el (org-remember-mode-map):