From: Joakim Verona <joakim@verona.se>
Date: Thu, 15 Aug 2013 16:41:51 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2816
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7d5ffd611d0fbeb9d55180d328e9203f3a1e199;p=emacs.git

merge from trunk
---

d7d5ffd611d0fbeb9d55180d328e9203f3a1e199