[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=8a768fd

The following commit has been merged in the master branch:
commit 8a768fdc3e3c6fa4c4fcfb7d74ab71d8782f4bb5
Merge: b1a65ecf7c6877eda895d5a63bfcdae39a791516 60c38ed3778a3f3914b05315579f6f839474cb3b
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Apr 10 23:05:11 2013 +0200

    Merge branch 'kde-telepathy-0.6'

 src/add-account-assistant.cpp  | 7 ++++++-
 src/kcm-telepathy-accounts.cpp | 6 +++++-
 src/kcm-telepathy-accounts.h   | 2 ++
 src/salut-enabler.cpp          | 7 ++++++-
 4 files changed, 19 insertions(+), 3 deletions(-)

-- 
ktp-accounts-kcm packaging