[geary: 2/2] Merge branch 'iso-codes' into 'master'

[Michael Gratton <mjog src gnome org>]

commit ea77494219caec8ac31f10cb16bca61097f65c97
Merge: 71617bf9 beec7ff0
Author: Michael Gratton <mike vee net>
Date:   Thu Aug 9 13:36:52 2018 +0000

    Merge branch 'iso-codes' into 'master'
    
    build: obtain iso-codes prefix from pkg-config
    
    See merge request GNOME/geary!38

 .gitlab-ci.yml | 4 ++--
 INSTALL        | 6 +++---
 debian/control | 2 ++
 meson.build    | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)
---