From: Joakim Verona <joakim@verona.se>
Date: Sun, 25 Aug 2013 19:56:43 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2731
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bdc620822ad19cf60b99ef20f255c0a61aa16119;p=emacs.git

merge from trunk
---

bdc620822ad19cf60b99ef20f255c0a61aa16119