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

merge from trunk
---

bd2867f0787a5dc14da39859830c3d3024b1e117