pidgin/pidgin

Merge with no conflicts.
release-2.x.y
2014-01-13, Mark Doliner
3214e5d99b41
Merge with no conflicts.
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