[geary] (10 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:

  644506d... MailMerge.Processor: Add field parser object, use in `conta
  73be92c... MailMerge: Implement initial email merging

Commits added to the branch:

  27dbd52... MailMerge.Processor: Add field parser object, use in `conta
  cec9484... MailMerge: Implement initial email merging
  aaf5800... Sidebar.Branch: Fix assert when removing a folder
  5947b9e... Application.MainWindow: Select another folder is when selec
  d514a41... Plugin.Infobar: Allow plugins to be notified of close butto
  aa4a1aa... Sidebar.Branch: Fix compiler warning, improve code style
  05616f0... Plugin.InfoBar: Enable plugins to dynamically update info b
  eb38a3b... Plugin.Actionable: Support specifying icons
  f223308... MailMerge.Folder: Add skeleton properties for accessing fol
  73ee377... Plugin.MailMerge: Add info bar to merge folder with status