From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 06:45:50 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2693
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6481f6dd5203af347dca2ff2cf599be8e79fb1b9;p=emacs.git

merge from trunk
---

6481f6dd5203af347dca2ff2cf599be8e79fb1b9