[gnome-initial-setup] (6 commits) Non-fast-forward update to branch wjt/standardize-COPYING

[Marge Bot <marge-bot src gnome org>]

The branch 'wjt/standardize-COPYING' 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:

  8feedb8... Standardize COPYING to just contain GPLv2

Commits added to the branch:

  34462d5... timezone: Build against gweather-4.0 (*)
  7cb6d68... timezone: Import GWeatherLocationEntry (*)
  f372682... timezone: Renamespace LocationEntry, update to GWeather-4.0 (*)
  a7dfea2... timezone: Reintroduce GisLocationEntry (*)
  0bdf5a2... Merge branch 'wjt/gweather-4' into 'master' (*)
  e3d65d6... Standardize COPYING to just contain GPLv2

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