pidgin/pidgin

pidgin/pidgin/
Merged TALOS-CAN-0137
release-2.x.y
2016-06-12, Gary Kramlich
5ae57760ca10