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

merge from trunk
---

cb0b8a957cbf53f35179f571841c8cda2c276959