master updated (c6fc066 -> 68b8f31)

[Robert Pluim]

rpluim pushed a change to branch master.

      from  c6fc066   ; * etc/NEWS: Fix a recently modified entry.
       new  04e2360   Update provenance comment in charscript.el
       new  fdaae2e   Move compose-gstring-for-variation-glyph
       new  184469d   Add a few more missing emoji overrides
       new  6738111   Generate skin tone compositions from emoji-sequences.txt
       new  3ced9e3   ; * etc/NEWS: improve some recently added entries
       new  68b8f31   ; * doc/misc/tramp.texi: Grammar fixes for 
process-connection-type


Summary of changes:
 admin/unidata/Makefile.in   |  4 ++--
 admin/unidata/blocks.awk    |  7 +++++--
 admin/unidata/emoji-zwj.awk | 14 +++-----------
 doc/misc/tramp.texi         | 26 +++++++++++++-------------
 etc/NEWS                    |  6 +++---
 lisp/composite.el           | 22 ++++++++++++++++++++++
 lisp/language/japanese.el   | 23 -----------------------
 7 files changed, 48 insertions(+), 54 deletions(-)