[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=0c45fd9

The following commit has been merged in the master branch:
commit 0c45fd94b447c45ba11dd2279a137b2b8bb314d5
Merge: 642e30a663a32b1f8f856441b4bb40c15ad67cb9 87e11e6ab4ce8ce94e5ef9a19d43ab19c53ab4a7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Sep 29 22:21:40 2013 +0000

    Merge branch 'kde-telepathy-0.7'
    
    Conflicts:
    	plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake
    	src/settings-im-and-voip.desktop

 src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop | 1 -
 src/kcm_ktp_accounts.desktop                                            | 1 -
 2 files changed, 2 deletions(-)

-- 
ktp-accounts-kcm packaging