[gedit] (14 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:

  fdbed8d... Add candidate-encodings gsetting

Commits added to the branch:

  3f26a6b... EncodingsComboBox: rename COLUMN_ADD -> COLUMN_CONFIGURE_RO (*)
  11ad99d... Improve doc of gedit_encodings_combo_box_get_selected_encod (*)
  b7a3048... EncodingsDialog: more consistent attribute names (*)
  4b7cc53... EncodingsDialog: some code clean-up (*)
  91d45db... EncodingsDialog: use gtk_tree_selection_count_selected_rows (*)
  b9dee75... EncodingsDialog: get_selected_encodings() util function (*)
  cc1189d... EncodingsDialog: simplify a function (*)
  0f792dc... EncodingsComboBox: update correctly the menu (*)
  0e38000... Do not use gloabal vars for the command line parsing (*)
  7182107... Handle also application::open (*)
  36a0d4d... Bump gtksourceview requirement (*)
  695d56c... Rework the headerbar according to the latest mockups (*)
  57aea1f... Release 3.13.5 (*)
  92ea5e7... Add candidate-encodings gsetting

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