From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 20:27:26 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2663
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f7470d118360c67a7a2cf3a0aa29280980a6da3;p=emacs.git

merge from trunk
---

5f7470d118360c67a7a2cf3a0aa29280980a6da3