pidgin/pidgin

Merge with fix-bonjour-mac
release-2.x.y
2016-10-06, Daniel Atallah
a696332798b9
Merge with fix-bonjour-mac