[totem] (2 commits) Non-fast-forward update to branch wip/hadess/more-blacklist

[Bastien Nocera <hadess src gnome org>]

The branch 'wip/hadess/more-blacklist' 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:

  c2539ea... gallery: Use new totem_gst_disable_display_decoders() helpe

Commits added to the branch:

  12aa8c7... backend: Use GProxyResolver to fetch proxy information (*)
  4cfc8c3... gallery: Use new totem_gst_disable_display_decoders() helpe

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