Merge remote-tracking branch 'origin/kde-telepathy-0.3'
author Daniele E. Domenichelli
()
committer Daniele E. Domenichelli
()
commit 7b004734e3f978c0dcae1fc8dd14fa891f4e53c7
tree 92ebf530d3864932fbb123584e877a6264c3b6d5
parent 908acec6de7e037f2f8aac41b04126fc7061a77a
parent b172d19a78c5478da3d1ee32d23d8ac6d63cf4d0
Merge remote-tracking branch 'origin/kde-telepathy-0.3'