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

merge from trunk
---

c5f293d04763b207b3bb1120230c10f8096dc232