From: Joakim Verona <joakim@verona.se>
Date: Fri, 23 Aug 2013 10:31:49 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2745
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=95a60dc06b2d05485a702e62ee00834a71753922;p=emacs.git

merge from trunk
---

95a60dc06b2d05485a702e62ee00834a71753922