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

merge from trunk
---

584bb3a913701a6324d020c87a39e03828fa0bd1