[gupnp] (8 commits) Non-fast-forward update to branch wip/fix-gi

[Jens Georg <jensgeorg src gnome org>]

The branch 'wip/fix-gi' 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:

 http://live.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  6cf9b6c... WIP

Commits added to the branch:

  00a73ff... Do not try to reuse message on error (*)
  e914903... Call action callback through idle on error (*)
  1c11743... examples/light-client: add --quiet, --help and repeat optio (*)
  7d1c1d6... examples/light-server: add --quiet and --help options (*)
  35f53a6... Prepare 0.20.7 (*)
  8ddee9d... Post-release version bump (*)
  a234854... Properly include gio.h for GSocket (*)
  469caaf... WIP

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