From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 07:06:54 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2672
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=376499bab806ced18cc52fd7101a2eb70a61a9cc;p=emacs.git

merge from trunk
---

376499bab806ced18cc52fd7101a2eb70a61a9cc