From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 18:12:26 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2740
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=aedb3873bb150227acd4b9496127a2e250d9da66;p=emacs.git

merge from trunk
---

aedb3873bb150227acd4b9496127a2e250d9da66