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

merge from trunk
---

6d2a4fc753d8533b4124fe59432bf4991c1db6b7