[meld/epel7] (11 commits) ...Merge branch 'master' into epel7

[Lubomir Rintel]

Summary of changes:

  dcb534d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass (*)
  e32c8fc... New upstream release: Meld 1.7.5 (*)
  1397576... New upstream release: Meld 1.8.0 (*)
  326d543... New upstream release: Meld 1.8.1 (*)
  715170c... New upstream release: Meld 1.8.2 (*)
  bef4b72... update .gitignore (*)
  6e8648d... New upstream release: Meld 1.8.3 (*)
  1f350b9... add virtual Provides for mergetool (RHBZ#990449) (*)
  6b14499... Update to 3.11.0 (*)
  4635c80... Update the file list and use the new build-system (*)
  e38c4ec... Merge branch 'master' into epel7

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