From: Stephen Berman <stephen.berman@gmx.net>
Date: Fri, 21 Jun 2013 18:37:42 +0000 (+0200)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=716b665eb3a134a5d1ccefd5d4c735e7e7ef62d5;p=emacs.git

Merge from trunk.
---

716b665eb3a134a5d1ccefd5d4c735e7e7ef62d5