From: Joakim Verona <joakim@verona.se>
Date: Fri, 16 Aug 2013 15:22:23 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2793
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2bc8a1cc3cb8347f820d1c59319ee45fdb06c351;p=emacs.git

merge from trunk
---

2bc8a1cc3cb8347f820d1c59319ee45fdb06c351