Merge from origin/emacs-24

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

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

2 files changed, 10 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 9a160446b35..bcc43c52af2 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-03  Kelvin White  <kwhite@gnu.org>
+
+        * MAINTAINERS: Add myself to section 2
+
+2015-03-03  Glenn Morris  <rgm@gnu.org>
 2015-03-03  Glenn Morris  <rgm@gnu.org>
 
         * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address
diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 57f199b27c2..61c70c1e82c 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -78,6 +78,11 @@ Bastien Guerry
 2.
 ==============================================================================
 
+Kelvin White
+       ERC
+           lisp/erc/*
+           doc/misc/erc.texi
+
 Eli Zaretskii
         doc/*
         lispref/*