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

Merge from trunk.
---

cc24ef09f8c050808f9f4989e49122b206e8c934