pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
VOID:INT64
VOID:OBJECT
VOID:POINTER
VOID:POINTER,BOOLEAN
VOID:STRING,BOXED
VOID:VOID