[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=179abd7

The following commit has been merged in the master branch:
commit 179abd7192b4905c3e6525833e45a4035c0558f7
Merge: 5f57fbebc6759fb53241250350ffb3c134c29e10 7da8872a3015c145c5477d5bdcfb794b370b2709
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Sun Jan 16 21:27:08 2011 +0100

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

 butterfly/butterfly-account-ui-plugin.cpp | 4 +++-
 butterfly/butterfly-account-ui-plugin.h   | 2 +-
 gabble/gabble-account-ui-plugin.cpp       | 4 +++-
 gabble/gabble-account-ui-plugin.h         | 2 +-
 gabble/server-settings-widget.cpp         | 2 +-
 haze/haze-account-ui-plugin.cpp           | 4 +++-
 haze/haze-account-ui-plugin.h             | 2 +-
 idle/idle-account-ui-plugin.cpp           | 4 +++-
 idle/idle-account-ui-plugin.h             | 3 +--
 9 files changed, 17 insertions(+), 10 deletions(-)

-- 
ktp-accounts-kcm packaging