From: Joakim Verona <joakim@verona.se>
Date: Thu, 22 Aug 2013 04:21:28 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2752
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98b421872a0894ff860ac6284cd077c96475de1a;p=emacs.git

merge from trunk
---

98b421872a0894ff860ac6284cd077c96475de1a