From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 16:38:33 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2771
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db3552accac421806591cb6b189f093e8f7c5f47;p=emacs.git

merge from trunk
---

db3552accac421806591cb6b189f093e8f7c5f47