[geary] (5 commits) Non-fast-forward update to branch mjog/949-translation-plural-form

[Michael Gratton <mjog src gnome org>]

The branch 'mjog/949-translation-plural-form' 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:

  9df26a7... Retain a number of messages when performing GC
  aecfa8c... Fix bug with message retention count during GC plus fix tes
  d734b61... Plugin.MailMerge: Fix API doc comment
  55daae0... Plugin.MailMerge: Fix translatable string that should be in

Commits added to the branch:

  497d990... Retain a number of messages when performing GC (*)
  4fdaaea... Fix bug with message retention count during GC plus fix tes (*)
  710eeb1... Merge branch '937-retain-messages-during-gc' into 'mainline (*)
  ba44fb0... Plugin.MailMerge: Fix API doc comment
  f014108... Plugin.MailMerge: Fix translatable string that should be in

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