[kdepim-runtime/f17] (18 commits) ...Merge branch 'master' into f17

[Rex Dieter]

Summary of changes:

  aa7afa9... 4.8.80 (*)
  7bb9145... 4.8.90 (*)
  2184eb9... fixup patch (*)
  bb63c4a... +akonadi-google bits (*)
  22e512e... BR: qjson-devel (*)
  06e3a18... rebuild (shared-desktop-ontologies) (*)
  1b7b7dc... 4.8.95 (*)
  fce96ce... missing Kolab Resource (#835904) (*)
  6afdc46... 4.8.97 (*)
  2fa3780... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  abf2774... 4.9.0 (*)
  1fb20cd... up akonadi deps, BR: strigi-devel (*)
  429cece... add rhel/fedora condition (*)
  68818d2... akonadi_kcm_sqlite patch upstreamed, yay (*)
  5a9d94c... 4.9.1 (*)
  a400791... update gitignore (*)
  2e46e2e... patch upstreamed (*)
  ced80d9... Merge branch 'master' into f17

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