pidgin/pidgin

Clean merge.
release-2.x.y
2014-01-15, Mark Doliner
900c8ac8b4fb
Clean merge.
BOOLEAN:VOID
BOOLEAN:STRING
VOID:INT,INT,INT,INT
VOID:INT,INT
VOID:POINTER,POINTER
BOOLEAN:INT,INT
BOOLEAN:INT,INT,INT
BOOLEAN:POINTER,POINTER,POINTER
BOOLEAN:INT,INT,INT,POINTER
VOID:STRING,STRING
VOID:POINTER,BOOLEAN