[gnome-settings-daemon] (2 commits) Non-fast-forward update to branch wip/carlosg/do-not-overwrite-error

[Benjamin Berg <bberg src gnome org>]

The branch 'wip/carlosg/do-not-overwrite-error' 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:

  097bf4b... power: Avoid setting error twice

Commits added to the branch:

  28b6c3b... print-notifications: Ignore Server* messages from cups noti (*)
  cfefb39... power: Avoid setting error twice

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