From: Joakim Verona <joakim@verona.se>
Date: Sat, 17 Aug 2013 04:51:11 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2788
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d83564549f573e0934653129d18597892d3533de;p=emacs.git

merge from trunk
---

d83564549f573e0934653129d18597892d3533de