From: Joakim Verona <joakim@verona.se>
Date: Wed, 21 Aug 2013 18:37:17 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2756
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=696296a32ecd33da891a15ae56db6208fee5b027;p=emacs.git

merge from trunk
---

696296a32ecd33da891a15ae56db6208fee5b027