From: Joakim Verona <joakim@verona.se>
Date: Wed, 12 Jun 2013 21:08:43 +0000 (+0200)
Subject: merge upstream
X-Git-Tag: emacs-25.0.90~2904
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dd7febaa6c58b6c0163ab0f7344ea70b51614460;p=emacs.git

merge upstream
---

dd7febaa6c58b6c0163ab0f7344ea70b51614460