; Cleanup of change log. Removed obsolete email addresses.

1 files changed, 1 insertions, 13 deletions

diff --git a/ChangeLog.2 b/ChangeLog.2
index 3636e382eb2..945f7871ddf 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -785,14 +785,6 @@
         * lisp/net/tramp-compat.el (tramp-compat-delete-dups): New defun.
         * lisp/net/tramp-smb.el (tramp-smb-handle-directory-files): Use it.
 
-2015-10-28  Anders Lindgren  <andlind@gmail.com>
-
-        Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh
-
-        Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
-
-        Merge branch 'master' of /Volumes/HD2/build/emacs-git-ssh
-
 2015-10-28  Michael Albinus  <michael.albinus@gmx.de>
 
         * lisp/net/tramp-smb.el (tramp-smb-handle-directory-files):
@@ -812,10 +804,6 @@
         * nsterm.m (ns_constrain_all_frames, ns_init_term): Block input.
         * nsterm.m (ns_send_appdefined, EmacsApp): Trace output.
 
-2015-10-28  Anders Lindgren  <andlind@gmail.com>
-
-        Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/emacs
-
 2015-10-28  Artur Malabarba  <bruce.connor.am@gmail.com>
 
         * src/process.c (Fget_buffer_process): Improve docstring.
@@ -1764,7 +1752,7 @@
 
 2015-10-23  Anders Lindgren  <andlind@gmail.com>
 
-        NextSten maximization and NSTRACE rewrite
+        NextStep maximization and NSTRACE rewrite
 
         Full-height, full-width, and maximized windows now cover the
         entire screen (except the menu bar), including the part where the