From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 07:07:17 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2802
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c10e4a6625e48c063473d77685c15ec8bba374a;p=emacs.git

merge from trunk
---

4c10e4a6625e48c063473d77685c15ec8bba374a