Merge from origin/emacs-24

bef46ba Fix bad bug number reference, shall be 19427.

Conflicts:
	src/ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 9bc28de681368601039271245f8116267cf3d53d..b58714353c14b37e3021fecc9e8bfdeeb1e7073c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,7 @@
 
        * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
        when going to fullscreen (Bug#0x180004f).
+
 2014-12-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring.
@@ -10,8 +11,6 @@
 
        * gnutls.c (gnutls_init): Fix deprecation warning from GCC.
 
-2014-12-27  Eli Zaretskii  <eliz@gnu.org>
-
 2014-12-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        Use bool for boolean in xselect.c, xsettings.c