[gnome-settings-daemon] (7 commits) Non-fast-forward update to branch wip/carlosg/xsettings-default-im

[Carlos Garnacho <carlosg src gnome org>]

The branch 'wip/carlosg/xsettings-default-im' 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:

  3f02d08... xsettings: Remove direct mapping from gtk-im-module to Gtk/

Commits added to the branch:

  4b1ecfa... tests: Enable dconf service for new dbusmock compatibility (*)
  15dc11c... power: Fix mutter version check in test code (*)
  c2db0ec... Update British English translation (*)
  0aad6f4... Update Basque translation (*)
  333f58c... Update French translation (*)
  64ac7fc... plugins: Stop using GSlice (*)
  418c07a... xsettings: Remove direct mapping from gtk-im-module to Gtk/

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