[metacity] Non-fast-forward update to branch wip/iainl/gnome-3-18-window-scaling

[Iain Lane <iainl src gnome org>]

The branch 'wip/iainl/gnome-3-18-window-scaling' 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:

  6048304... libmetacity: scale window decorations on HiDPI displays
  5384072... theme: improve scaling
  8031808... theme: fix font size

Commits added to the branch:

  8b4ef7c... theme: scale window decorations on HiDPI displays