Merge from origin/emacs-24

The following commit was skipped:

48a9d9f Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24
This commit is contained in:
Fabián Ezequiel Gallina 2014-12-27 13:17:18 -03:00
commit c3c51ec274

Diff content is not available