From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 14:35:08 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2853
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88790a579512914b5608d9756cae9bb982ce7c41;p=emacs.git

merge from trunk
---

88790a579512914b5608d9756cae9bb982ce7c41