From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 20 Apr 2013 08:01:06 +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~17
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/47ec731ececec750654e12cbd649e2cd90e069e8

Merge from trunk.
---

47ec731ececec750654e12cbd649e2cd90e069e8