From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 19 Dec 2014 11:48:49 +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^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=09ab6fe;p=emacs.git

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

Conflicts:
	lisp/ChangeLog
---

09ab6fedb2314ad1f6ef1cac8643e4b75d4798a2