From: Joakim Verona <joakim@verona.se>
Date: Sun, 25 Aug 2013 10:27:13 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2733
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=37f54c5079d36bae4ee4f133c45d349bab564c48;p=emacs.git

merge from trunk
---

37f54c5079d36bae4ee4f133c45d349bab564c48