pidgin/pidgin

Clean merge.

2014-01-28, Mark Doliner
6f2f61656a95
Clean merge.
VOID:POINTER,POINTER,OBJECT
BOOLEAN:OBJECT,POINTER,STRING
VOID:STRING,STRING
VOID:STRING,STRING,DOUBLE
VOID:ENUM,STRING,STRING
VOID:ENUM,STRING,STRING,BOOLEAN
VOID:FLAGS,FLAGS
VOID:STRING,STRING,OBJECT,OBJECT