[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=afb9e9a

The following commit has been merged in the master branch:
commit afb9e9a54275ac81541f4a2e2945d52c207f2ca8
Merge: c336be80a1b667765e41f572fdb53395e5e5ed5a c086a55bb68b932348f68711f38684cbd12d2da7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Nov 22 22:57:13 2012 +0100

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	data/ktelepathy.notifyrc

 KTp/wallet-interface.cpp | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

-- 
ktp-common-internals packaging