From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 07:41:49 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2671
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=64a5e06b03dc129445712cfca770b886e5f1285f;p=emacs.git

merge from trunk
---

64a5e06b03dc129445712cfca770b886e5f1285f