pidgin/pidgin

pidgin/pidgin/
Merged public changes in
release-2.x.y
2016-06-12, Gary Kramlich
0de7b0180441