1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-27 23:50:30 -08:00

Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Michael Albinus 2014-12-19 12:56:52 +01:00
commit 48a9d9fdbb

Diff content is not available