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

merge from trunk
---

2676aa6d82f3b92f060daa088cffbfdb4c56904d