From: Joakim Verona <joakim@verona.se>
Date: Fri, 13 Sep 2013 17:40:40 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2648
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9523ac3289ca64bd74c42a1cc20ed1df7a9896e7;p=emacs.git

merge from trunk
---

9523ac3289ca64bd74c42a1cc20ed1df7a9896e7