Merge from origin/emacs-24
commit85ca47671ccbffe87d6ccad17039b49d6b676d61
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:45 +0000 (28 01:03 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Wed, 28 Jan 2015 04:03:45 +0000 (28 01:03 -0300)
tree4bc4f9690295e76ab4d220c474d37478a22740a8
parent294127e7d59a5d23a32561716a1b192db410e12f
parent4c09e3aef9a366ffebd314d01f666e04bd7798e2
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.