From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 23:16:33 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2682
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04f74f0e0200d94a049edff749eec790b7400811;p=emacs.git

merge from trunk
---

04f74f0e0200d94a049edff749eec790b7400811