[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=4362a95

The following commit has been merged in the master branch:
commit 4362a959f4e0f86cbce819ea047fe079d452af28
Merge: 3329c00412f01ee96ff7b75c8a0284315ae9bbac f75e17ebb87d05e256a2f48db31ab8b5adb19850
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Thu Oct 4 21:19:06 2012 +0200

    Merge branch 'kde-telepathy-0.5'

 plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop | 2 +-
 plugins/gabble/ktpaccountskcm_plugin_gabble.desktop       | 2 +-
 plugins/haze/ktpaccountskcm_plugin_haze.desktop           | 2 +-
 plugins/idle/ktpaccountskcm_plugin_idle.desktop           | 2 +-
 plugins/rakia/ktpaccountskcm_plugin_rakia.desktop         | 2 +-
 plugins/salut/ktpaccountskcm_plugin_salut.desktop         | 2 +-
 plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop   | 2 +-
 src/KCMTelepathyAccounts/profile-list-model.cpp           | 2 +-
 src/kcm-telepathy-accounts.cpp                            | 4 ++--
 9 files changed, 10 insertions(+), 10 deletions(-)

-- 
ktp-accounts-kcm packaging