[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=f575085

The following commit has been merged in the master branch:
commit f575085fdd93c4dd8769e58fab4919d5e9cfb417
Merge: 264e6b1037adf41ce5c245eb695c3c4099c7ba2d 0d871da5da04e9c0a0cbba717597fd09f5de3e06
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Mon Dec 26 15:31:21 2011 +0100

    Merge branch 'krazy2'
    
    REVIEW: 103535

 account-button.cpp               |  2 +-
 contact-delegate-overlay.cpp     |  4 ++--
 context-menu.cpp                 |  7 ++++---
 dialogs/join-chat-room-dialog.ui | 16 ++++++++++++++--
 global-presence-chooser.cpp      | 13 +++++++------
 tooltips/contacttooltip.cpp      |  2 +-
 6 files changed, 29 insertions(+), 15 deletions(-)

-- 
ktp-contact-list packaging