From: Joakim Verona <joakim@verona.se>
Date: Tue, 20 Aug 2013 08:41:59 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2765
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=404511db22e1836034b8301df48f5989a00f0361;p=emacs.git

merge from trunk
---

404511db22e1836034b8301df48f5989a00f0361