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

[Rex Dieter]

Summary of changes:

  42b577b... 4.12.90 (*)
  a0cb24c... 4.12.95 (*)
  e535959... 4.12.97 (*)
  f9363c2... 4.13.0 (*)
  8545272... 4.13.1 (*)
  3207d3f... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  7d7739d... 4.13.2 (*)
  ad04c83... Revert "4.12.5"
  f5b8b6b... Revert "4.12.4"
  ba2a4e0... Merge branch 'master' into f20

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