[gedit] (2 commits) Non-fast-forward update to branch wip/loader-saver

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

The branch 'wip/loader-saver' 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:

  307d65a... Deprecate GeditEncoding (use GtkSourceEncoding instead)
  ea8205e... Adapter between GtkSourceFile and file saving gedit API

Commits added to the branch:

  42a8884... Use a macro for the "ensure-trailing-newline" setting (*)
  afa4a42... Deprecate GeditEncoding (use GtkSourceEncoding instead)

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