[gnome-software] (10 commits) Non-fast-forward update to branch 1649-support-appstream-merging

[Milan Crha <mcrha src gnome org>]

The branch '1649-support-appstream-merging' 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:

  baf0238... gs-plugin-appstream: Move gathering of system appstream dir
  8306974... gs-plugin-appstream: Use a GPtrArray for desktop files dirs
  d501c87... gs-appstream: Add gs_appstream_add_current_locales()
  92f48fa... gs-plugin-appstream: Use gs_appstream_add_current_locales()
  4bdad6a... gs-flatpak: Use gs_appstream_add_current_locales()
  d7a60b7... gs-flatpak: Set GUID on the XbBuilder
  71ef935... gs-details-page: Use gs_appstream_add_current_locales()
  9f92616... gs-appstream: Add gs_appstream_add_data_merge_fixup()
  86b303f... gs-plugin-appstream: Use gs_appstream_add_data_merge_fixup(
  858edcb... gs-flatpak: Use gs_appstream_add_data_merge_fixup()

Commits added to the branch:

  a371a3e... gs-plugin-appstream: Move gathering of system appstream dir
  9fef1bc... gs-plugin-appstream: Use a GPtrArray for desktop files dirs
  4739b03... gs-appstream: Add gs_appstream_add_current_locales()
  2597511... gs-plugin-appstream: Use gs_appstream_add_current_locales()
  b9e1f26... gs-flatpak: Use gs_appstream_add_current_locales()
  782b3c5... gs-flatpak: Set GUID on the XbBuilder
  0e79762... gs-details-page: Use gs_appstream_add_current_locales()
  b384ac2... gs-appstream: Add gs_appstream_add_data_merge_fixup()
  0627abd... gs-plugin-appstream: Use gs_appstream_add_data_merge_fixup(
  9e008d6... gs-flatpak: Use gs_appstream_add_data_merge_fixup()