pidgin/pidgin

Merged TALOS-CAN-0134
release-2.x.y
2016-06-12, Gary Kramlich
406382495c37
Merged TALOS-CAN-0134
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im