[gnome-software] (13 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:

  c0d2c92... gs-appstream: Add gs_appstream_load_desktop_files()
  acee1aa... gs-plugin-appstream: Use gs_appstream_load_desktop_files()
  1b63e69... gs-flatpak: Use gs_appstream_load_desktop_files()
  bbf41a4... gs-plugin-appstream: Move gathering of system appstream dir
  2a07fbc... gs-plugin-appstream: Use a GPtrArray for desktop files dirs
  6b0e9f8... gs-appstream: Add gs_appstream_add_current_locales()
  f0948e1... gs-plugin-appstream: Use gs_appstream_add_current_locales()
  a89c3d9... gs-flatpak: Use gs_appstream_add_current_locales()
  520af56... gs-details-page: Use gs_appstream_add_current_locales()
  1a99bd3... gs-appstream: Add gs_appstream_add_data_merge_fixup()
  3257801... gs-plugin-appstream: Use gs_appstream_add_data_merge_fixup(

Commits added to the branch:

  f3df5b2... gs-appstream: Add gs_appstream_load_desktop_files()
  cac71ec... gs-plugin-appstream: Use gs_appstream_load_desktop_files()
  f7604d4... gs-flatpak: Use gs_appstream_load_desktop_files()
  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()