-
Committer:
David Edmundson
-
Date:
2014-04-25 16:00:26 UTC
-
mfrom:
(699.1.17 trunk)
-
Revision ID:
kde@davidedmundson.co.uk-20140425160026-bqt94vosgckiqi69
Merge branch 'origin-kde-telepathy-0.8'
Conflicts:
plugins/sipe/ktpaccountskcm_plugin_sipe.desktop.cmake