From kde-commits  Wed Jul 31 23:04:33 2013
From: David Edmundson <kde () davidedmundson ! co ! uk>
Date: Wed, 31 Jul 2013 23:04:33 +0000
To: kde-commits
Subject: [ktp-auth-handler] /: Merge branch 'kde-telepathy-0.6'
Message-Id: <E1V4fRZ-0003Iv-5d () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=137531188001780

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

Merge branch 'kde-telepathy-0.6'

M  +1    -1    CMakeLists.txt

http://commits.kde.org/telepathy-auth-handler/fefe75ca4f488e1ef3eadb17d0d8d=
2530402a796