Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru

2 files changed, 3 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20a2d76c751..73693ed78e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,12 +6,12 @@
 2014-10-03  Martin Rudalics  <rudalics@gmx.at>
 
         * frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
-        In doc-string mention need of setting `frame-resize-pixelwise'.
+        In doc-string mention need to set `frame-resize-pixelwise'.
 
 2014-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc/vc-svn.el (vc-svn-after-dir-status): Fix the non-remote regexp,
-        similarly to Roger's 2010-06-12 change for the remote change
+        similarly to Rogers's 2010-06-16 change for the remote case
         (bug#18605).
 
 2014-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 036bf825168..5a8a9b250a1 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -587,7 +587,7 @@
         * ox-ascii.el (org-ascii--box-string): Choose more universal
         Unicode characters for boxquote corners.
 
-2014-10-03  marcowahlsoft@gmail.com  <marcowahlsoft@gmail.com>  (tiny change)
+2014-10-03  Marco Wahl  <marcowahlsoft@gmail.com>  (tiny change)
 
         * org-agenda.el (org-agenda-bulk-mark)
         (org-agenda-bulk-mark-regexp, org-agenda-bulk-toggle-all): Fix