From: Joakim Verona <joakim@verona.se>
Date: Wed, 14 Aug 2013 07:43:14 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2835
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c3f73b429285a46c61296c81813617febc908fce;p=emacs.git

merge from trunk
---

c3f73b429285a46c61296c81813617febc908fce