[kdenetwork-filesharing/f20] (10 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  8b40ba6... 4.12.90 (*)
  6be479e... 4.12.95 (*)
  51d816a... 4.12.97 (*)
  bc72a11... 4.13.0 (*)
  25d42b7... 4.13.1 (*)
  7c897db... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  bf64339... 4.13.2 (*)
  a59935f... Revert "4.12.5"
  67f96c9... Revert "4.12.4"
  93a8cc3... Merge branch 'master' into f20

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