Merge changes from topic 'kde-abook-plugins'
commitc90050855e616460269d7412bb46f80cee458c59
authorJan Kundrát <jkt@kde.org>
Sat, 25 Jul 2015 11:32:33 +0000 (25 13:32 +0200)
committerGerrit Code Review <noreply@kde.org>
Sat, 25 Jul 2015 11:32:34 +0000 (25 13:32 +0200)
treef3b955d9c0fd11456e626cc819184b1ded12f82c
parenteb05e744c19f1a1826d13e75379775394c0cf049
parentcca1368e1042a986e6183b2ed6f17e1d3be8a37c
Merge changes from topic 'kde-abook-plugins'

* changes:
  Add KDE KResource addressbook plugin
  Add KDE Akonadi addressbook plugin