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

[Rex Dieter]

Summary of changes:

  f6e541c... 4.12.90 (*)
  7be9fc6... 4.12.95 (*)
  d254f41... 4.12.97 (*)
  548fdb8... 4.13.0 (*)
  5809b67... 4.13.1 (*)
  46a90a0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  6ed7454... 4.13.2 (*)
  da83597... Revert "4.12.5"
  f476a21... Revert "4.12.4"
  e9fe90d... Merge branch 'master' into f20

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