From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 09:11:34 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2690
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d1ae916c78cf224dd9b107b42d1258db7b096c11;p=emacs.git

merge from trunk
---

d1ae916c78cf224dd9b107b42d1258db7b096c11