[umbrello/f20] (9 commits) ...Merge branch 'master' into f20

[Rex Dieter]

Summary of changes:

  8719567... 4.11.90 (*)
  24766fc... 4.11.95 (*)
  a7a6009... 4.11.97 (*)
  5c74975... 4.12.0 (*)
  90743d9... 4.12.1 (*)
  12ef441... 4.12.2 (*)
  c07edc4... Revert "4.11.5"
  25a9b74... Revert "4.11.4"
  736a63e... Merge branch 'master' into f20

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