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

[Rex Dieter]

Summary of changes:

  8750363... 4.12.90 (*)
  71a0770... 4.12.95 (*)
  e29ac03... 4.12.97 (*)
  80b9fcf... 4.13.0 (*)
  d54733d... 4.13.1 (*)
  cf95e5f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  bf2bd45... 4.13.2 (*)
  d4ae3e1... Revert "4.12.5"
  139ce56... Revert "4.12.4"
  fe2cebd... Merge branch 'master' into f20

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