From: Joakim Verona <joakim@verona.se>
Date: Wed, 21 Aug 2013 21:41:33 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2754
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd535b9b33faf09920ef2f6bf56c8720fa60c905;p=emacs.git

merge from trunk
---

fd535b9b33faf09920ef2f6bf56c8720fa60c905