[pango] (6 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:

  2915d9a... Add PangoHbFont and PangoSimpleFontMap
  4bd1675... test-shape: Use a simple fontmap
  529c5f9... pangocairo: handle PangoHbFont
  24cacdb... pango-view: Add a --font-file option
  33ee3a3... Add a matrix
  6bc23a2... Fix vertical metrics
  67f89fd... Fix glyph extents to look right

Commits added to the branch:

  171f528... Add PangoHbFont and PangoSimpleFontMap
  9f6fe75... test-shape: Use a simple fontmap
  94b65b4... pangocairo: handle PangoHbFont
  d18a89e... pango-view: Add a --font-file option
  26a4c43... Add a matrix
  b160ae7... Fix glyph extents to look right