Merge from origin/emacs-24
commit4b72b4f91122704b805e2696b2e9342226359de0
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:26:58 +0000 (27 13:26 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:26:58 +0000 (27 13:26 -0300)
treebe363f256ecf6b4ef3fd9bddfa9c25fe19cb590c
parent938d65136b6d8c4ea91313216c873d2084be4240
parentbef46ba222e11e6f9942fae796b42e718317ec0e
Merge from origin/emacs-24

bef46ba Fix bad bug number reference, shall be 19427.

Conflicts:
src/ChangeLog
src/ChangeLog