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

Merge from trunk.
---

245ddcaa82a7778f662f28584eab8be48c7cfede