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

The following commit has been merged in the master branch:
commit cee55a0b249d933b66a67646e5c2b026137626bd
Merge: 518077e20d38356b7729d7a5ddea19a5b386bf25 fd55fd4156bf15f6cde961061a77f98a24c58eb7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Oct 29 08:56:46 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	src/kcm_ktp_accounts.desktop

 plugins/rakia/rakia-advanced-options-widget.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

-- 
ktp-accounts-kcm packaging