From kde-commits  Wed Jul 31 23:20:19 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 23:20:19 +0000
To: kde-commits
Subject: [ktp-text-ui] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fgp-0006Ty-SN () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531282802072

Git commit 25a89549446628a53e729be5e8ccd31af8970097 by David Edmundson.
Committed on 31/07/2013 at 23:20.
Pushed by davidedmundson into branch 'master'.

Merge branch 'kde-telepathy-0.6'

M  +1    -1    CMakeLists.txt

http://commits.kde.org/telepathy-text-ui/25a89549446628a53e729be5e8ccd31af8=
970097