From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 15:06:31 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2820
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e4b4bda83d2adf59dd7e9530c6f03bce9d45ccf1;p=emacs.git

merge from trunk
---

e4b4bda83d2adf59dd7e9530c6f03bce9d45ccf1