[meld: 2/2] Merge branch 'icon-tint-Gdk.Color' into 'master'

[Kai Willadsen <kaiw src gnome org>]

commit e9c32843f019d6c78b0a43ee440a5dd2051fa0c5
Merge: 40c0ccb7 b8715c7f
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Jun 30 03:30:21 2018 +0000

    Merge branch 'icon-tint-Gdk.Color' into 'master'
    
    EmblemCellRenderer crashes if you try to give it a Gdk.Color
    
    See merge request GNOME/meld!14

 meld/tree.py                  |  6 +-----
 meld/ui/emblemcellrenderer.py | 14 ++++----------
 2 files changed, 5 insertions(+), 15 deletions(-)
---