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

merge from trunk
---

88475263ceab0e918384ae21d531893012c42954