From: Joakim Verona <joakim@verona.se>
Date: Sat, 17 Aug 2013 11:01:45 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2785
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8604d6f7f50459016220e21063ff51c1b38b7f0f;p=emacs.git

merge from trunk
---

8604d6f7f50459016220e21063ff51c1b38b7f0f