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

merge from trunk
---

f211300506e978ca56553398cc0e20976cb91247