[geary] (6 commits) Non-fast-forward update to branch allow_image_banner_options

[Cédric Bellegarde <cbellegarde src gnome org>]

The branch 'allow_image_banner_options' 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:

  e7c997c... client: Add more options for displaying images from message

Commits added to the branch:

  7c0ad63... client: conversation-viewer: Give more room to composer in  (*)
  0cbbd37... Merge branch 'composer_height' into 'mainline' (*)
  01e10d4... Update POTFILES.in (*)
  4f63759... Add Cédric and myself as maintainers (*)
  c1cbd6e... util-logging: fix fatal warnings logic (*)
  68bede9... client: Add more options for displaying images from message

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