From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 20:21:38 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2809
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a6266f5865449ecb66c69f08c8f9042633721b47;p=emacs.git

merge from trunk
---

a6266f5865449ecb66c69f08c8f9042633721b47