From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 30 Jan 2016 19:43:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2791
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3005605776955593e0b416de9e1ebf158114343e;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

ad879b7 Backport:fix previous change of src/ftfont.c (ftfont_shape_by_flt)
4a3db0f support rendering of wider range of combinging characters by ftfont backend
---

3005605776955593e0b416de9e1ebf158114343e