From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 04:16:37 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2748
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=87174f325be32b8967bb50a81ad8f43a9482f10f;p=emacs.git

merge from trunk
---

87174f325be32b8967bb50a81ad8f43a9482f10f