-

diff --cc admin/release-process
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/progmodes/cc-defs.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc test/lisp/net/tramp-tests.el
Simple merge