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

[Rex Dieter]

Summary of changes:

  9914b2e... 4.12.90 (*)
  405441d... 4.12.95 (*)
  b4652ba... 4.12.97 (*)
  906d8ce... 4.13.0 (*)
  a51bea5... 4.13.1 (*)
  3c493d8... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  de7d890... 4.13.2 (*)
  789a432... Revert "4.12.5"
  5e176f1... Revert "4.12.4"
  51bf838... Merge branch 'master' into f20

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