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

[Rex Dieter]

Summary of changes:

  9c6a054... 4.11.90 (*)
  ab5714b... 4.11.95 (*)
  dd16b0c... 4.11.97 (*)
  9f45d31... rebuild (exiv2) (*)
  f36b8f1... 4.12.0 (*)
  fdf1de4... 4.12.1 (*)
  edf04ee... 4.12.2 (*)
  93c4fcb... Revert "4.11.5"
  3f0bf60... Revert "4.11.4"
  32157fa... Merge branch 'master' into f20

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