[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=97b8a50

The following commit has been merged in the master branch:
commit 97b8a50599348e98054aee5d76013bb7092498e0
Merge: e0d94ed320b4db009a5b5832a23e101eb50d76e8 a5e465747b71f35c120684b0322770b4d660c2d5
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Feb 17 20:58:10 2014 +0100

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

 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
ktp-accounts-kcm packaging