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

merge from trunk
---

b08b88950d94aad9145163b424e544d78c172c84