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

Merge from trunk.
---

a34a8cd1e46594c5776f187dd98583bcb82f9bc0