[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=8e8e5f7

The following commit has been merged in the master branch:
commit 8e8e5f72c6affdc9e5b2ba1c42fc672e0c9db72b
Merge: 4c87ccb77147e0ec4aac701c78c2ab2f218787db e5bba4596b75a08ec4c81f761dd7290a52438c57
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Apr 24 13:59:46 2011 +0100

    Merge branch 'master' of git://anongit.kde.org/telepathy-accounts-kcm-plugins

 .reviewboardrc                                          | 1 +
 butterfly/kcmtelepathyaccounts_plugin_butterfly.desktop | 1 +
 gabble/kcmtelepathyaccounts_plugin_gabble.desktop       | 2 ++
 haze/haze-icq-account.cpp                               | 5 +----
 haze/haze-yahoo-account.cpp                             | 6 +-----
 haze/kcmtelepathyaccounts_plugin_haze.desktop           | 2 ++
 idle/kcmtelepathyaccounts_plugin_idle.desktop           | 1 +
 rakia/kcmtelepathyaccounts_plugin_rakia.desktop         | 2 ++
 rakia/rakia-account-ui.cpp                              | 1 -
 salut/kcmtelepathyaccounts_plugin_salut.desktop         | 4 ++++
 salut/salut-account-ui.cpp                              | 1 -
 sunshine/kcmtelepathyaccounts_plugin_sunshine.desktop   | 4 ++++
 12 files changed, 19 insertions(+), 11 deletions(-)

-- 
ktp-accounts-kcm packaging