From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 06:51:42 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2659
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b501019048b1f8986132843a7a629036abce8e98;p=emacs.git

merge from trunk
---

b501019048b1f8986132843a7a629036abce8e98