[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/0.4.0-1-22-g6f904bb

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-kded-integration-module.git;a=commitdiff;h=25dbf41

The following commit has been merged in the master branch:
commit 25dbf412e7115c0896125a004721ced545608bc7
Merge: 2440df1678f0b62b657fd16e3eea2eccc4ac9e05 ad2f206fe5c539674fb94249f8c39f585cc5129f
Author: Diane Trout <diane at caltech.edu>
Date:   Fri May 17 14:05:27 2013 -0700

    Merge tag 'upstream/0.6.1'
    
    Upstream version 0.6.1

 contact-request-handler.cpp             |    2 +-
 error-handler.cpp                       |    3 +++
 po/ca/kded_ktp_integration_module.po    |   37 +++++++++++++++----------------
 po/cs/kded_ktp_integration_module.po    |   10 ++++-----
 po/fi/kded_ktp_integration_module.po    |    6 ++---
 po/hu/kded_ktp_integration_module.po    |   10 ++++-----
 po/lt/kded_ktp_integration_module.po    |   37 +++++++++++++++----------------
 po/nb/kded_ktp_integration_module.po    |    2 +-
 po/pl/kded_ktp_integration_module.po    |   14 ++++++------
 po/zh_CN/kded_ktp_integration_module.po |    8 +++----
 10 files changed, 65 insertions(+), 64 deletions(-)

-- 
ktp-kded-integration-module packaging