pidgin/pidgin

Merge default back in
use-gresolver
2015-12-21, Gary Kramlich
ef015fb22744
Merge default back in
For information on hacking on Pidgin, Finch, or libpurple, see:
https://developer.pidgin.im