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

merge from trunk
---

df15e4f6391d475acf15dcb512a28eed9964caac