pidgin/pidgin

pidgin/pidgin/
Merge upstream, resolve conflicts

15 months ago, qarkai
00a9ef389aab