[kolourpaint] (5 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  382e518... 4.11.4 (*)
  45b3053... 4.11.5 (*)
  3b7f012... Revert "4.11.5" (*)
  7a23859... Revert "4.11.4" (*)
  00f26cf... Merge branch 'master' into f20 (*)

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