Merge from origin/emacs-24
commitc12598a62e2e31f3377c52fe4b283b710ce1451e
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 28 Dec 2014 18:14:19 +0000 (28 10:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 28 Dec 2014 18:14:19 +0000 (28 10:14 -0800)
treefe895873e492db9dd92e8c56c81d8c0903ec4174
parent20791069fa34b486c018ba7f27982bdc6ad2a4ea
parent39eaef9f8b5aa9481e8d7c636f27b87fe8310060
Merge from origin/emacs-24

The following commits were skipped:

39eaef9 lisp/international/mule.el (define-coding-system): Fix typos in the doc string. Add missing ChangeLog entry for the previous commit.
df932d8 lisp/international/mule.el (define-coding-system): Improve docstring.