Merge branches 'master', 'master' and 'master' of git://anongit.kde.org/akonadi-google-applets
author Jan Grulich
()
committer Jan Grulich
()
commit b779d548f122336c5cc452ac5586bc04bf001b41
tree dfdfed0b9e5edaa16f2c5b9d6100429c977f12e4
parent 46c882726d422a1834c77354cded89f64f2dddd4
Merge branches 'master', 'master' and 'master' of git://anongit.kde.org/akonadi-google-applets