From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 06:01:26 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2776
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e86a500d430c41e7fd8c7412c3a638154186b83b;p=emacs.git

merge from trunk
---

e86a500d430c41e7fd8c7412c3a638154186b83b