From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 16 May 2013 09:58:56 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~229^2~63^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9519e2685d19b13ce4e3e1ba13f97569013627e;p=emacs.git

Merge from trunk.
---

a9519e2685d19b13ce4e3e1ba13f97569013627e