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

merge from trunk
---

e1f065a76ff5639376235956fdf98de73c4219a6