[gnome-settings-daemon] (15 commits) Non-fast-forward update to branch wip/benzea/multiple-keybindings

[Benjamin Berg <bberg src gnome org>]

The branch 'wip/benzea/multiple-keybindings' 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:

  3c838b1... media-keys: Disable timeout for all operations on key grabb
  fe2a32b... media-keys: Rework key grabbing code
  2e78a6e... NEWS: Add note about use of new UngrabAccelerators DBus API
  41b980a... media-keys: Remove ordered registration of keybindings
  ffc491e... common: Pass new default value during schema migration
  0210e56... common: Don't reset settings after updating the value
  3c86427... media-keys: Make internal keybindings to be lists
  42a7238... media-keys: Drop key name from static array
  89a08ef... common: Pass old default and allow resetting when migrating
  db66cc9... media-keys: Drop user set value if it used to be the defaul
  f326703... media-keys: Move all keyboard bindings into settings
  d245d94... media-keys: Remove KEY_SLEEP as it was merged into KEY_HIBE

Commits added to the branch:

  bd840e2... power: Increase blank delay for screensaver (*)
  6b80bdd... Update Indonesian translation (*)
  a1c2685... smartcard: Cancel cancellable when stopping (*)
  aca2358... media-keys: Disable timeout for all operations on key grabb
  d493f50... media-keys: Rework key grabbing code
  903522a... NEWS: Add note about use of new UngrabAccelerators DBus API
  70abccb... media-keys: Remove ordered registration of keybindings
  2624c77... common: Pass new default value during schema migration
  7202d68... common: Don't reset settings after updating the value
  44f53c6... media-keys: Make internal keybindings to be lists
  11b989a... media-keys: Drop key name from static array
  75bf9f5... common: Pass old default and allow resetting when migrating
  28684f8... media-keys: Drop user set value if it used to be the defaul
  121a6f8... media-keys: Move all keyboard bindings into settings
  c9020e6... media-keys: Remove KEY_SLEEP as it was merged into KEY_HIBE

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