From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 00:31:27 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2808
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=858133b65d760c087b38fe463b9eae49a1c319d7;p=emacs.git

merge from trunk
---

858133b65d760c087b38fe463b9eae49a1c319d7