From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 01:11:36 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2841
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cdbfa34f19db4742f6f2c253b6f009710c598443;p=emacs.git

merge from trunk
---

cdbfa34f19db4742f6f2c253b6f009710c598443