GitLab

f1601063 Avoid assertion violations in Rmail due to newline cache
1b0ebbdb browse-url-firefox: update for firefox 36's removal of -remote
18178922 Avoid erratic behavior of menu-bar tooltips on w32  (Bug#19925)
02609324 Bump python.el version
b0adfc72 Spelling fixes
35f047c0 * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971ab * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7c Mention in admin/notes/repo how to mark commits not to be merged.
86fe7502 # Remove NEWS temporary markup
4fa778b6 erc.el: Add old version header for package.el compatibilty
9366f054 Tramp: Disable paging with PAGER=cat

Conflicts:
	admin/notes/repo
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog