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

merge from trunk
---

432336f04440701a10fd58eeacfa14683a9ae903