From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 08:31:40 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2859
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cd462fd025ea06895b9e4508c869b61d6be28d3;p=emacs.git

merge from trunk
---

8cd462fd025ea06895b9e4508c869b61d6be28d3