[totem] Non-fast-forward update to branch wip/hadess/vcd-config

[Bastien Nocera <hadess src gnome org>]

The branch 'wip/hadess/vcd-config' 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:

  cefdff3... grilo: Move code to config file

Commits added to the branch:

  a29d695... grilo: Move VCD disablement to config file