[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=094038d

The following commit has been merged in the master branch:
commit 094038d7140519a045adeda63acdc05c4cd631e3
Merge: 8b71877efe5c489cdfb9400ccc41240c266cf024 9d39b891aca118267dc9593d2baca8eb34b789fb
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Oct 25 15:05:17 2012 +0200

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop
    	plugins/gabble/ktpaccountskcm_plugin_gabble.desktop
    	plugins/haze/ktpaccountskcm_plugin_haze.desktop
    	plugins/idle/ktpaccountskcm_plugin_idle.desktop
    	plugins/rakia/ktpaccountskcm_plugin_rakia.desktop
    	plugins/salut/ktpaccountskcm_plugin_salut.desktop
    	plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop
    	src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
    	src/kcm_ktp_accounts.desktop
    	src/settings-im-and-voip.desktop

 src/edit-account-dialog.cpp | 16 +++++++++++++++-
 src/edit-account-dialog.h   |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

-- 
ktp-accounts-kcm packaging