[metacity] (6 commits) Non-fast-forward update to branch wip/muktupavels/work-areas

[Alberts Muktupāvels <muktupavels src gnome org>]

The branch 'wip/muktupavels/work-areas' 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:

  25d4b1e... screen: set per-monitor work areas

Commits added to the branch:

  aef654c... remove Solaris Xinerama support (*)
  c5dd4a7... refer to monitors as "monitors" rather than "xineramas" (*)
  83b05fd... window: fix a copy/paste error (*)
  f69d242... screen: set per-monitor work areas
  f129808... window: use MetaEdge for struts
  ae595d1... window: add support for _NET_WM_STRUT_AREA

(*) This commit already existed in another branch; no separate mail sent