[gedit] (5 commits) Non-fast-forward update to branch wip/merge-encoding-settings

[Sébastien Wilmet <swilmet src gnome org>]

The branch 'wip/merge-encoding-settings' 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:

  2907161... Add candidate-encodings gsetting
  1760dfb... EncodingsDialog: make displayed encodings not sortable

Commits added to the branch:

  00f8d92... Improve doc of gedit_document_get_metadata() (*)
  df3ab29... Add candidate-encodings gsetting
  653aafc... EncodingsDialog: make displayed encodings not sortable
  ba2d7d8... EncodingsDialog: show UTF-8 in the available encodings
  9dd865d... Use candidate-encodings gsetting in ComboBox and Dialog

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