[gnome-settings-daemon] (2 commits) Non-fast-forward update to branch benzea/timetravel

[Benjamin Berg <bberg src gnome org>]

The branch 'benzea/timetravel' 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:

  a133131... meson: Add option to run using UML time-travel mode
  f0a23c3... tests: Unset display environment variables

Commits added to the branch:

  82356e0... tests: Unset display environment variables (*)
  1299b99... meson: Add option to run using UML time-travel mode

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