From: Joakim Verona <joakim@verona.se>
Date: Sat, 24 Aug 2013 02:36:40 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2738
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=202cca22fe9e2451a8d3cabe0c443ba985289503;p=emacs.git

merge from trunk
---

202cca22fe9e2451a8d3cabe0c443ba985289503