[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=cd799a3

The following commit has been merged in the master branch:
commit cd799a358ac3aecdd468df3ab622ed983d768c6a
Merge: e7badfa93fdfab18c7b5914f4f8b2607c13494b7 7968444089d52142d95531a1b3a6a3c1e0940ee1
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Feb 14 13:41:44 2013 +0000

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	src/kcm_ktp_accounts.desktop

 plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop | 2 +-
 plugins/gabble/ktpaccountskcm_plugin_gabble.desktop       | 2 +-
 plugins/haze/ktpaccountskcm_plugin_haze.desktop           | 2 +-
 plugins/idle/ktpaccountskcm_plugin_idle.desktop           | 2 +-
 plugins/rakia/ktpaccountskcm_plugin_rakia.desktop         | 2 +-
 plugins/salut/ktpaccountskcm_plugin_salut.desktop         | 2 +-
 plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop   | 2 +-
 src/kcm-telepathy-accounts.cpp                            | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

-- 
ktp-accounts-kcm packaging