From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 02:28:55 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2840
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d91bd8ed5d34f17cfa64d50ef02d414b962150a;p=emacs.git

merge from trunk
---

0d91bd8ed5d34f17cfa64d50ef02d414b962150a