pidgin/pidgin

Merge upstream, resolve conflicts

2019-11-04, qarkai
00a9ef389aab
Merge upstream, resolve conflicts
[wrap-hg]
directory = talkatu
url = https://bitbucket.com/pidgin/talkatu
revision = default