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

  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 

Commits added to the branch:

  acb9f92... Sidebar.Branch: Fix compiler warning, improve code style
  8e473ab... Plugin.Infobar: Allow plugins to be notified of close butto
  8dd1484... Plugin.InfoBar: Enable plugins to dynamically update info b
  aca958d... Plugin.Actionable: Support specifying icons
  aed55ce... Plugin.MailMerge: Add info bar to merge folder with status 
  8813e57... Geary.ComposedEmail: Allow send date to be updated
  1f2430b... MailMerge.Folder: Add skeleton properties for accessing fol
  3ae9ed8... MailMerge.Folder: Update backing collections
  050ab58... MailMerge.Folder: Implement sending merged email