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

merge from trunk
---

2f3ee26f12984352f2777cd51a00eceec196fd4c