From: Joakim Verona <joakim@verona.se>
Date: Mon, 16 Sep 2013 10:30:42 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2644
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2386911380e1261d50a3eb323853a711c60fcac0;p=emacs.git

merge from trunk
---

2386911380e1261d50a3eb323853a711c60fcac0