From kde-commits  Thu Oct 31 22:16:40 2013
From: Sven Brauch <svenbrauch () googlemail ! com>
Date: Thu, 31 Oct 2013 22:16:40 +0000
To: kde-commits
Subject: [ktp-common-internals] KTp/Widgets: Merge branch 'kde-telepathy-0.7'
Message-Id: <E1Vc0Xg-0000OQ-78 () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=138325780807641

Git commit 70e95db4a391c47a8da59e03948e35ca529ac201 by Sven Brauch.
Committed on 31/10/2013 at 22:15.
Pushed by brauch into branch 'master'.

Merge branch 'kde-telepathy-0.7'

M  +5    -5    KTp/Widgets/join-chat-room-dialog.cpp

http://commits.kde.org/telepathy-common-internals/70e95db4a391c47a8da59e039=
48e35ca529ac201