pidgin/pidgin

Merged public changes in
release-2.x.y
2016-06-12, Gary Kramlich
0de7b0180441
Merged public changes in
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im