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

merge from trunk
---

fda7ba7c422a8d5a5827e33bb1c800778790955f