From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 4 Apr 2015 21:58:01 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~5
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/48395495d6f6602f666c11d0b38f6600b629ccfc

Merge from origin/emacs-24

The following commit was skipped:

1b70aa6 Fix bug#20233, do not merge with master
---

48395495d6f6602f666c11d0b38f6600b629ccfc