From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 05:36:50 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2727
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=efe162a9b43555097d85becb636acab6184b20bc;p=emacs.git

merge from trunk
---

efe162a9b43555097d85becb636acab6184b20bc