From: Joakim Verona <joakim@verona.se>
Date: Tue, 13 Aug 2013 12:39:54 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2855
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6293f2abae4379768c2071149eb2152ffa117437;p=emacs.git

merge from trunk
---

6293f2abae4379768c2071149eb2152ffa117437