From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 19 Dec 2014 11:56:52 +0000 (+0100)
Subject: Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24
X-Git-Tag: emacs-24.4.90~124
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=48a9d9f;p=emacs.git

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

Conflicts:
	lisp/ChangeLog
---

48a9d9fdbbe8946ae29393ee8bc24c6f6619003c