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

[Will Thompson <wjt src gnome org>]

The branch 'wjt/gweather-4' 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:

  0c37347... timezone: Build against gweather-4.0
  c01a937... timezone: Import GWeatherLocationEntry
  253982d... timezone: Renamespace LocationEntry, update to GWeather-4.0
  cd90b2d... timezone: Reintroduce GisLocationEntry

Commits added to the branch:

  84e6f66... software: update to match new design (*)
  f3c738b... Merge branch 'mcatanzaro/software-page-updates' into 'maste (*)
  371d84d... timezone: Build against gweather-4.0
  eafb3ee... timezone: Import GWeatherLocationEntry
  910e5d5... timezone: Renamespace LocationEntry, update to GWeather-4.0
  36ea01b... timezone: Reintroduce GisLocationEntry

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