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

[Rex Dieter]

Summary of changes:

  e377d6f... 4.12.90 (*)
  704f380... 4.12.95 (*)
  a5ba9bf... 4.12.97 (*)
  5f30248... 4.13.0 (*)
  0dc640b... 4.13.1 (*)
  ebc1bdc... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  1f4a265... 4.13.2 (*)
  2bebc03... Revert "4.12.5"
  0869711... Revert "4.12.4"
  899d74d... Merge branch 'master' into f20

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