pidgin/pidgin

Merging public updates
release-2.x.y
2018-03-08, Gary Kramlich
233025cb30f5
Merging public updates
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im