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

The following commit has been merged in the master branch:
commit a4c86b1876fcb2670aebf1bf8068f36a2b8476dd
Merge: 631f39bbcf974fb52790852d0b23d70367e62e80 03e4550beaf8fd5a11945831b1c0ff5208424db6
Author: Dan Vrátil <dvratil at redhat.com>
Date:   Thu Oct 25 15:00:00 2012 +0200

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

 KTp/wallet-interface.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

-- 
ktp-common-internals packaging