[geary] (28 commits) Non-fast-forward update to branch mjog/mail-merge-plugin

[Michael Gratton <mjog src gnome org>]

The branch 'mjog/mail-merge-plugin' 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:

  cb577ce... Plugins: Add initial MailMerge plugin outline
  5a28a2c... Application.PluginManager: Update plugin settings for depen
  d75afbc... Components.PreferencesWindow: Update plugin rows when deps 
  f72d3a6... Components.InfoBarStack: Support additional stack queue alg
  4524bbf... Plugins: Actually implement info bar plugin priority
  06f247a... Trivial doc comment update
  1d16069... Geary.EmailHeaderSet: Seal setting properties off from sub-
  c5e2d58... Util.Email.strip_subject_prefixes: Convert param to EmailHe
  20cee76... Plugin.Email: Mark Geary.EmailHeaderSet as a prerequisite
  13754d3... Plugin.Email: Add load_body_as method and implement it
  0e4e720... Plugin.MailMerge: Implement basic merge field parsing
  541637c... Plugin.MailMerge: Add simple CSV reader with unit tests
  17c3fdb... src/client/plugin/mail-merge/meson.build: Fix rpath on wron
  bc66b82... Application.PluginManager: Rework context state management
  e2d520f... Application.Controller: Rework composer life-cycle, again
  0edfc9f... Plugins: Update to new composer lifecycle
  ca41397... Plugin.Button: Rename to Actionable
  2a8b293... Plugin.Composer: Support registering composer menu items
  26e4aad... vala-unit: Minor test fixups
  b8be415... Plugins.MailMerge: Initial composer mail merge support
  46f2787... src/client: Misc minor build warning and doc comment update
  73edfd7... Plugin.ActionBar: New class added for plugins that use acti
  e18481d... Composer.Widget: Place composer action bars into their own 
  8167562... Plugin.Composer: Support plugins for providing composer act
  f6b523e... Plugin.MailMerge: Show a composer action bar after loading 

Commits added to the branch:

  0c57eed... Don't use unsupported vala syntax (*)
  42b13b8... Merge branch 'ricotz/vala' into 'mainline' (*)
  897722f... Fix Mallard validation errors by changing section IDs (*)
  4c1531a... Plugins: Add initial MailMerge plugin outline
  84a9188... Application.PluginManager: Update plugin settings for depen
  213d1d9... Components.PreferencesWindow: Update plugin rows when deps 
  cf3c77d... Components.InfoBarStack: Support additional stack queue alg
  5fe0fbc... Plugins: Actually implement info bar plugin priority
  4152b78... Trivial doc comment update
  84fd9cb... Geary.EmailHeaderSet: Seal setting properties off from sub-
  9b275b3... Util.Email.strip_subject_prefixes: Convert param to EmailHe
  872de2d... Plugin.Email: Mark Geary.EmailHeaderSet as a prerequisite
  4348d23... Plugin.Email: Add load_body_as method and implement it
  3fb1281... Plugin.MailMerge: Implement basic merge field parsing
  f08fa06... Plugin.MailMerge: Add simple CSV reader with unit tests
  fbfc484... src/client/plugin/mail-merge/meson.build: Fix rpath on wron
  64e6627... Application.PluginManager: Rework context state management
  89c1e3f... Application.Controller: Rework composer life-cycle, again
  c00c7c3... Plugins: Update to new composer lifecycle
  a330344... Plugin.Button: Rename to Actionable
  65509e2... Plugin.Composer: Support registering composer menu items
  c90a6f5... vala-unit: Minor test fixups
  026039d... Plugins.MailMerge: Initial composer mail merge support
  342cb7c... src/client: Misc minor build warning and doc comment update
  0bd1943... Plugin.ActionBar: New class added for plugins that use acti
  b68807e... Composer.Widget: Place composer action bars into their own 
  0a78ba6... Plugin.Composer: Support plugins for providing composer act
  a663d75... Plugin.MailMerge: Show a composer action bar after loading 

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