From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 18:46:44 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2812
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=28bfe2167958a42d2974f3466db5193c385ce3cd;p=emacs.git

merge from trunk
---

28bfe2167958a42d2974f3466db5193c385ce3cd