[geary: 2/2] Merge branch 'mjog/contacts-upsert' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 9b83bf0fa31fa2351c3976000d3c318b03b92913
Merge: 3e7a9dac 12d0cced
Author: Michael Gratton <mike vee net>
Date:   Sat Oct 26 05:16:23 2019 +0000

    Merge branch 'mjog/contacts-upsert' into 'mainline'
    
    Use SQL UPSERT clause when updating contacts
    
    See merge request GNOME/geary!346

 meson.build                                      |  2 +-
 src/engine/common/common-contact-store-impl.vala | 41 +++++++++---------------
 2 files changed, 17 insertions(+), 26 deletions(-)
---