[compiz-plugins-unsupported/f18] (5 commits) ...fix merge conflicts

[Wolfgang Ulbrich]

Summary of changes:

  89b0d78... add compiz-plugins-unsupported-aarch64.patch (*)
  65580b3... add compiz-plugins-unsupported_automake-1.13.patch (*)
  80a6fdf... remove compiz-plugins-unsupported_mate.patch (*)
  871c53c... update spec file and bump version (*)
  89c9069... fix merge conflicts

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