GitLab

c0ba5908 Fix vertical-motion and posn-at-point when word-wrap is
a323b93d Better multi-line input support in comint.el
008a04ac todo-mode.el: Restore point on setting item done  (Bug#19727)
9615c0de doc/misc/erc.texi: fix typo
c6487170 Update ERC docs and update MAINTANERS to include myself
d825f66d Fix filling circle/ellipse in Artist Mode  (Bug#19763)

Conflicts:
	admin/ChangeLog
	doc/misc/ChangeLog
	doc/misc/erc.texi
	lisp/ChangeLog
	src/ChangeLog