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

merge from trunk
---

f07c6c2676516f1da78e473844d24b3b53a47170