[geary/mainline: 2/2] Merge branch 'wip/324-remove-master-slave' into 'mainline'

[Michael Gratton <mjog src gnome org>]

commit 29389bc38e37e2e155cbbf8ed5e657466108cf64
Merge: 68093c8e aa223d10
Author: Michael Gratton <mike vee net>
Date:   Tue Apr 2 03:04:45 2019 +0000

    Merge branch 'wip/324-remove-master-slave' into 'mainline'
    
    Replace references to `master` with `primary`
    
    See merge request GNOME/geary!192

 src/client/accounts/accounts-manager.vala        |   4 +-
 src/engine/db/db-database.vala                   | 114 ++++++++++++++---------
 src/engine/db/db-versioned-database.vala         |   2 +-
 src/engine/db/db.vala                            |   3 +-
 src/engine/util/util-reference-semantics.vala    |   4 +-
 test/engine/db/db-database-test.vala             |  14 +--
 test/engine/imap-db/imap-db-attachment-test.vala |  12 +--
 test/engine/imap-db/imap-db-database-test.vala   |   2 +-
 8 files changed, 92 insertions(+), 63 deletions(-)
---