[libkipi/f17] (16 commits) ...Merge branch 'f18' into f17

[Rex Dieter]

Summary of changes:

  c6ae9a6... libkipi update from digikam-3.0.0-beta1 (*)
  3144ee7... Added libkipi translations from digikamcd (*)
  5e863a5... Revert "Added libkipi translations from digikamcd" (*)
  9afcd49... 4.9.80 (*)
  9a54f97... 4.9.4 (*)
  2e4e8aa... Revert "4.9.4" (*)
  6cdcf0f... 4.9.90 (4.10 beta2) (*)
  49c3d95... update (*)
  b260e1b... 4.9.95 (*)
  4ff89fd... 4.9.97 (*)
  8c0594e... 4.9.98 (*)
  821cc87... 4.10.0 (*)
  f633a4b... 4.10.1 (*)
  7e3e4e4... Merge branch 'master' into f18 (*)
  7406d7e... fix merge (grr) (*)
  bf2bd5e... Merge branch 'f18' into f17

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