[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=067fca0

The following commit has been merged in the master branch:
commit 067fca09179a9d4eb9f314ae3b83726346fa89dd
Merge: 7d6ff543f3d9a0b3f44fd25cfb441dad9f777a7f 199d5beccdaeaeabfb14dac58831fdf78279ac0d
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date:   Wed Jul 11 14:04:19 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    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

 data/profiles/sofiasip-sip.profile                  | 4 ++--
 plugins/gabble/ktpaccountskcm_plugin_gabble.desktop | 1 -
 plugins/salut/ktpaccountskcm_plugin_salut.desktop   | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

-- 
ktp-accounts-kcm packaging