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

[Rex Dieter]

Summary of changes:

  d51591c... 4.11.90 (*)
  f1235dc... 4.11.95 (*)
  9766c06... 4.11.97 (*)
  733138d... 4.12.0 (*)
  d3bb487... 4.12.1 (*)
  e7047fa... 4.12.2 (*)
  316cc68... Revert "4.11.5"
  4256ca6... Revert "4.11.4"
  9e4440d... Merge branch 'master' into f20

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