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

merge from trunk
---

ef7cb56e57e53af78783a85df167f943bd5fe039