From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 06:37:00 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2837
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d50a0024015b4198a75dc70475b351d7c98d74f;p=emacs.git

merge from trunk
---

0d50a0024015b4198a75dc70475b351d7c98d74f