[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=4e76677

The following commit has been merged in the master branch:
commit 4e7667701d27884d7d607bf44f688b7698ae9664
Merge: 2570ae220a5a349404bf0aa80ed3d4bd73b2eec0 0bac14720e673183050529488e3ddc5f50872b83
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Mon Mar 16 17:42:08 2015 +0100

    Merge branch 'Applications/15.04'

 CMakeLists.txt                              | 2 +-
 plugins/gabble/CMakeLists.txt               | 3 ++-
 plugins/gabble/proxy-settings-widget.ui     | 7 +------
 plugins/haze/CMakeLists.txt                 | 2 ++
 plugins/kaccounts/CMakeLists.txt            | 3 ++-
 plugins/kaccounts/kaccounts-ui-provider.cpp | 5 +++++
 6 files changed, 13 insertions(+), 9 deletions(-)

-- 
ktp-accounts-kcm packaging