From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 28 Dec 2014 18:14:19 +0000 (-0800)
Subject: Merge from origin/emacs-24
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~24^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c12598a62e2e31f3377c52fe4b283b710ce1451e;p=emacs.git

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.
---

c12598a62e2e31f3377c52fe4b283b710ce1451e