[ksaneplugin/f17] (9 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  5b17b56... 4.9.90 (*)
  e7cdbf2... 4.9.95 (*)
  bfe9f42... 4.9.97 (*)
  0ac71e1... 4.9.98 (*)
  2843c02... 4.10.0 (*)
  c539d04... 4.10.1 (*)
  c362aa1... Merge branch 'master' into f18 (*)
  98fb226... fix merge (grr) (*)
  109b139... Merge branch 'f18' into f17

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