From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 05:11:47 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2680
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6138b628138c110e647a5835440a3f183d1cab50;p=emacs.git

merge from trunk
---

6138b628138c110e647a5835440a3f183d1cab50