[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=01040af

The following commit has been merged in the master branch:
commit 01040af62d3af84372a29b4bb69eb7df05cbcec3
Merge: 54d0638636e6321248c5fafcca37ac03b0588a38 ee4c6120e006c5adda8fdf2d4390f0cb9f62ff9d
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sun Apr 13 18:42:49 2014 +0200

    Merge branch 'master' into frameworks

 KTp/Declarative/qml-plugins.cpp | 2 +-
 KTp/global-presence.cpp         | 5 +++++
 KTp/global-presence.h           | 7 +++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

-- 
ktp-common-internals packaging