diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /lisp/org/ChangeLog | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/org/ChangeLog')
| -rw-r--r-- | lisp/org/ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index e2b5437228d..b348d22d6de 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog | |||
| @@ -25488,7 +25488,7 @@ | |||
| 25488 | ;; add-log-time-zone-rule: t | 25488 | ;; add-log-time-zone-rule: t |
| 25489 | ;; End: | 25489 | ;; End: |
| 25490 | 25490 | ||
| 25491 | Copyright (C) 2008-2012 Free Software Foundation, Inc. | 25491 | Copyright (C) 2008-2013 Free Software Foundation, Inc. |
| 25492 | 25492 | ||
| 25493 | This file is part of GNU Emacs. | 25493 | This file is part of GNU Emacs. |
| 25494 | 25494 | ||