[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=46230a0

The following commit has been merged in the master branch:
commit 46230a08f16bb8de28f7f2bb4600e24ebb92a113
Merge: 4e7667701d27884d7d607bf44f688b7698ae9664 c29e690daa4a970ef918c768051634ca15e3640a
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Mar 17 16:15:12 2015 +0100

    Merge branch 'Applications/15.04'

 plugins/gabble/main-options-widget-googletalk.cpp               | 1 +
 plugins/kaccounts/kaccounts-ui-provider.cpp                     | 4 ++--
 src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

-- 
ktp-accounts-kcm packaging