[smokeqt/f20] (10 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  4e0d403... 4.12.90 (*)
  a4edf6e... 4.12.95 (*)
  4603bb9... 4.12.97 (*)
  b633a13... 4.13.0 (*)
  cb4ab67... 4.13.1 (*)
  319ff69... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  213689a... 4.13.2 (*)
  855167d... Revert "4.12.5"
  7993011... Revert "4.12.4"
  ad07f5f... Merge branch 'master' into f20

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