From: Joakim Verona <joakim@verona.se>
Date: Sat, 24 Aug 2013 08:57:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2737
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8e12af0396fe55210371d53c2f8e01783740bad9;p=emacs.git

merge from trunk
---

8e12af0396fe55210371d53c2f8e01783740bad9