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

The following commit has been merged in the master branch:
commit d2f9cf9bd9b85b95ed7601d01c363be452ba4f5f
Merge: cea4734d8f19d4b8c8aa08db313518de34297162 4a348c3fef185c88ae64d5d1e00c96eae0da240a
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Apr 25 18:00:26 2014 +0200

    Merge branch 'origin-kde-telepathy-0.8'
    
    Conflicts:
    	plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake

 CMakeLists.txt                                                      | 2 +-
 plugins/pintxo/ktpaccountskcm_plugin_pintxo.desktop.cmake           | 4 ++--
 .../ktpaccountskcminternal-accountuiplugin.desktop                  | 1 -
 src/kcm_ktp_accounts.desktop                                        | 2 +-
 src/settings-im-and-voip.desktop                                    | 6 ++----
 5 files changed, 6 insertions(+), 9 deletions(-)

-- 
ktp-accounts-kcm packaging