From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 12:42:07 +0000 (+0200)
Subject: merge from trunk
X-Git-Tag: emacs-25.0.90~2688
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0b086327ccb086dadf737286ffd54d5418e181c4;p=emacs.git

merge from trunk
---

0b086327ccb086dadf737286ffd54d5418e181c4