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

merge from trunk
---

86998326d00c947e2e05713b09f3b826f942de43