From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 17:25:29 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2649
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d892820f934c4c593d1d192af90f567511b3be68;p=emacs.git

merge from trunk
---

d892820f934c4c593d1d192af90f567511b3be68