[pango] (7 commits) Non-fast-forward update to branch simple-fontmap

[Matthias Clasen <matthiasc src gnome org>]

The branch 'simple-fontmap' 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:

  c293a98... Add PangoFcFontMap2
  31713b8... test-shape: Use a simple fontmap
  5510fae... pango-view: Add --fontmap and --font-file options
  71e4826... pangocairo: Allow picking the new fc fontmap
  89672ca... testmisc: Add another test
  cfd0f17... Improve serialization for PangoHbFont
  bd14d72... testmisc: Add a test for pango_font_describe

Commits added to the branch:

  1c1a414... Add PangoFcFontMap2
  3362742... test-shape: Use a simple fontmap
  adedd3f... pango-view: Add --fontmap and --font-file options
  1de1bf7... pangocairo: Allow picking the new fc fontmap
  e011de3... testmisc: Add another test
  97a1ced... Improve serialization for PangoHbFont
  4b95b74... testmisc: Add a test for pango_font_describe