From: Joakim Verona <joakim@verona.se>
Date: Wed, 21 Aug 2013 05:51:39 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2760
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5092c2e28a39e6fdf63cad5d9c59a53687ea807e;p=emacs.git

merge from trunk
---

5092c2e28a39e6fdf63cad5d9c59a53687ea807e