Merge from origin/emacs-24
commit98284ef51c67fa69796946466337d426ab81f9ee
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:52:04 +0000 (3 14:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 3 Mar 2015 22:52:04 +0000 (3 14:52 -0800)
treee43f8d3ab77f67a2fca1dd016037693674b91c26
parent518eab2f7db71929e4877daa5ebd06b1416e69e6
parentc4ade119ccd1904795b2e8d76cd93aedc86d1b09
Merge from origin/emacs-24

c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases

Conflicts:
lisp/ChangeLog
admin/ChangeLog
doc/lispref/ChangeLog
doc/misc/ChangeLog
etc/ChangeLog
etc/NEWS
etc/NEWS.24
lisp/ChangeLog
lisp/erc/ChangeLog
lisp/textmodes/ispell.el
src/ChangeLog