From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 15 Oct 2014 13:16:10 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~50^2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b8ec977659df3970a6c8afb7a5b79c9b61e08307;p=emacs.git

Merge from trunk.
---

b8ec977659df3970a6c8afb7a5b79c9b61e08307