From: Joakim Verona <joakim@verona.se>
Date: Sun, 18 Aug 2013 23:26:26 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2780
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06e4beffef13e1fbc1d7c5f204aec9d240357e7f;p=emacs.git

merge from trunk
---

06e4beffef13e1fbc1d7c5f204aec9d240357e7f