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

[Rex Dieter]

Summary of changes:

  beffd06... 4.12.90 (*)
  da0900d... 4.12.95 (*)
  232d1ce... 4.12.97 (*)
  2248a42... 4.13.0 (*)
  09d67a5... 4.13.1 (*)
  9b74fb3... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  259e0d7... 4.13.2 (*)
  4b484fc... Revert "4.12.5"
  1191bd2... Revert "4.12.4"
  79bdda9... Merge branch 'master' into f20

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