From: Fabián Ezequiel Gallina <fgallina@gnu.org>
Date: Wed, 28 Jan 2015 04:03:45 +0000 (-0300)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2572^2~43
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/85ca47671ccbffe87d6ccad17039b49d6b676d61

Merge from origin/emacs-24

The following commits were skipped:

4c09e3a Backport: correct old fix for GTK font selection
8730974 Backport from trunk of bug 19531.
---

85ca47671ccbffe87d6ccad17039b49d6b676d61