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

[Rex Dieter]

Summary of changes:

  9c64b33... 4.12.90 (*)
  b507573... 4.12.95 (*)
  8a116d2... 4.12.97 (*)
  fdb729f... 4.13.0 (*)
  e32da8e... 4.13.1 (*)
  fd44a5b... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  c019ad6... 4.13.2 (*)
  94be156... Revert "4.12.5"
  16aa3cd... Revert "4.12.4"
  56d2032... Merge branch 'master' into f20

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