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

merge from trunk
---

7701e0724215b82d2f635c19d7e7f2a9863e687c