meld-1.7.0-20140710
Merge tag 'meld-1.7.0-20140710'

meld-1.7.0-20140710