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

merge from trunk
---

433fc48f7db05643b7bab35e147ac2bc62713859