From: Joakim Verona <joakim@verona.se>
Date: Tue, 20 Aug 2013 22:26:48 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2762
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bbe1d42d34353bae5379bcf462fba1b67a328e93;p=emacs.git

merge from trunk
---

bbe1d42d34353bae5379bcf462fba1b67a328e93