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

merge from trunk
---

4cf8510dd6d33a59b4b6b9d18a9108fdb4cc6884