[ktouch/f20] (11 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  ddff257... 4.12.90 (*)
  92aac1b... update %files (*)
  8bce3f1... 4.12.95 (*)
  ba98a21... 4.12.97 (*)
  83eb663... 4.13.0 (*)
  c606233... 4.13.1 (*)
  f4a120e... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  988db70... 4.13.2 (*)
  b0451ba... Revert "4.12.5"
  40ca7be... Revert "4.12.4"
  51f46d9... Merge branch 'master' into f20

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