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

merge from trunk
---

e87eb4578d1dabd7805c7c501bccf3fd1c442958