From kde-commits  Mon Feb 28 23:41:27 2011
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Mon, 28 Feb 2011 23:41:27 +0000
To: kde-commits
Subject: =?utf-8?q?=5Btelepathy-chat-handler=5D_/=3A_Merge_branch_=27max?=
Message-Id: <20110228234127.A603FA60CE () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129893652828038

Git commit 50ea70411e527607ee1b9deed355a5a6b1a195b9 by David Edmundson.
Committed on 01/03/2011 at 00:41.
Pushed by davidedmundson into branch 'master'.

Merge branch 'max_text_edit_height'

I  +0    -2    lib/chattextedit.cpp     
I  +13   -0    lib/chatwidget.cpp     
I  +1    -0    lib/chatwidget.h     
I  +14   -1    lib/chatwidget.ui     

http://commits.kde.org/telepathy-chat-handler/50ea70411e527607ee1b9deed355a5a6b1a195b9