qulogic/pidgin

Merge TALOS-CAN-0118
release-2.x.y
2016-06-12, Gary Kramlich
5077da39b6de
Merge TALOS-CAN-0118
For information on hacking on Pidgin, Finch, or libpurple, see:
http://developer.pidgin.im