Merge with a fair number of conflicts. Nothing too crazy.
I didn't merge a lot of changes from 07e827917960
libpurple/protocols/gg/gg.c I think maybe that code has either been
removed or changed significantly in main.
PidginandFinch:ThePimpin' Penguin IM Clients That'reGoodfortheSoul