Merge branch 'kde-telepathy-0.3'
author Daniele E. Domenichelli
()
committer Daniele E. Domenichelli
()
commit 38d14d09cb63fb03cf00edaee3a9a08affabe5e8
tree a2d45230bec602f24bd831e006dc1fca3b18927d
parent 61cc42e69ce4fbd626b169ef0685aafe1397e0a5
parent 0ef7dd0734be94286438feab73a07dd16b97388a
Merge branch 'kde-telepathy-0.3'
x-messenger-oauth2-prompt.cpp