From: Joakim Verona <joakim@verona.se>
Date: Mon, 16 Sep 2013 07:41:28 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2645
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91d9cdf98e11c6caf8655f327c38a123b5ff22d8;p=emacs.git

merge from trunk
---

91d9cdf98e11c6caf8655f327c38a123b5ff22d8