From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 14:41:34 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2821
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=144b43729ef0acdb0243d72bfb49d5445bcd2a77;p=emacs.git

merge from trunk
---

144b43729ef0acdb0243d72bfb49d5445bcd2a77