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

merge from trunk
---

807033bc12639618712f96579868ac65cd98a871