master updated (c154309976 -> 99be0cfcd9)

[Eli Zaretskii]

eliz pushed a change to branch master.

      from  c154309976 Whitelist some incorrectly labeled "color" fonts under 
Xft
       new  cfd7edb5a9 Rename Oriya to Odia, and more
       new  99be0cfcd9 Provide Oriya language-environment alongside Odia


Summary of changes:
 etc/HELLO                 |   5 +-
 lisp/erc/erc-lang.el      |  12 ++---
 lisp/language/indian.el   |  26 ++++++++---
 lisp/leim/quail/indian.el | 116 ++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 143 insertions(+), 16 deletions(-)