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

[Rex Dieter]

Summary of changes:

  ec17b21... 4.11.90 (*)
  49c5196... 4.11.95 (*)
  6c8f0e8... 4.11.97 (*)
  ca707dd... 4.12.0 (*)
  8434a5c... 4.12.1 (*)
  bda12f3... 4.12.2 (*)
  bc93281... Revert "4.11.5"
  2534290... Revert "4.11.4"
  01c6779... Merge branch 'master' into f20

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