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

merge from trunk
---

44074387d5a68511f0da1fbcf6a695d1f8c7f112