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

merge from trunk
---

77df9fad7b2d502eb6f50752b57f6797296fa72a