From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 10 Dec 2013 17:56:03 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~446^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5bdc6977e3ab4b36646671754098df7e6ab92ad6;p=emacs.git

Merge from trunk.
---

5bdc6977e3ab4b36646671754098df7e6ab92ad6