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

merge from trunk
---

de1e8cda270190586a83f70033c8b6c1dfac2fa0