From: Joakim Verona <joakim@verona.se>
Date: Fri, 27 Jun 2014 10:10:03 +0000 (+0200)
Subject: manual upstream merge
X-Git-Tag: emacs-25.0.90~2637
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=83c4c0569f8c64f3dda203849e787a416c3fcd0d;p=emacs.git

manual upstream merge
---

83c4c0569f8c64f3dda203849e787a416c3fcd0d