From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 15:16:25 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2851
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7cb2f8b52926d37347e5a412abd7a004707258a6;p=emacs.git

merge from trunk
---

7cb2f8b52926d37347e5a412abd7a004707258a6