From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 1 May 2013 17:12:42 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Url: http://git.hcoop.net/bpt/emacs.git/commitdiff_plain/9c1a1306117d5c41be1beac981d33085fa0fe5a1

Merge from trunk.
---

9c1a1306117d5c41be1beac981d33085fa0fe5a1