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

The following commit has been merged in the master branch:
commit b4546f3e83a2af3648b5e04ce2ccb9b78611bf5d
Merge: 8b660ef716f1104abe9d7515fab8e565f5eb299f c755154e55d26ffdf2159981bfbec88a17adf9de
Author: Aleix Pol <aleixpol at kde.org>
Date:   Wed Jul 2 01:14:54 2014 +0200

    Merge branch 'master' into frameworks

 KTp/Logger/ktp_logger_plugin.desktop                           |  1 +
 .../plugins/tplogger/ktploggerplugin_tplogger.desktop.cmake    |  2 ++
 KTp/global-presence.h                                          |  3 ++-
 data/ktelepathy.notifyrc                                       | 10 ++++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

-- 
ktp-common-internals packaging