]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
authorEli Zaretskii <eliz@gnu.org>
Sun, 28 Oct 2018 15:55:00 +0000 (17:55 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sun, 28 Oct 2018 15:55:00 +0000 (17:55 +0200)
1  2 
etc/NEWS

diff --cc etc/NEWS
Simple merge