[compiz-plugins-unsupported/f17] (9 commits) ...fix merge conflicts

[Wolfgang Ulbrich]

Summary of changes:

  1cb655d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass (*)
  b3e92ff... add compiz-plugins-unsupported_new-mate.patch (*)
  8573bf6... add compiz-plugins-unsupported_remove_gconf_usage.patch (*)
  ba99fbf... update spec file and bump version (*)
  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 (*)
  d4558fa... fix merge conflicts

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