[geary] (5 commits) Non-fast-forward update to branch mjog/579-logging-deadlock

[Michael Gratton <mjog src gnome org>]

The branch 'mjog/579-logging-deadlock' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  6d74f4e... Fix deadlock when finalising log records generates more log

Commits added to the branch:

  dedcb65... Specify default HTML colours for composer & conversation vi (*)
  1308fcb... Don't crash on GMime error in RFC822.Message.without_bcc (*)
  6ddbf03... Merge branch 'mjog/581-crash-forwarding-mail' into 'mainlin (*)
  52c3c42... Merge branch 'wip/573-white-on-white-webkitgtk' into 'mainl (*)
  b43ff79... Fix deadlock when finalising log records generates more log

(*) This commit already existed in another branch; no separate mail sent