comparison libpurple/protocols/jabber/xdata.c @ 29924:0dcdccb03ea0

merge of '0303e2072e9df6a3ea825f996a260acd80f12da7' and '67de3fff150c538c01ca66706c29a8f19cbfeff1'
author Mark Doliner <mark@kingant.net>
date Thu, 04 Mar 2010 09:23:19 +0000
parents a538cb73f897
children 7fb775b4465b
comparison
equal deleted inserted replaced
29923:962bc012a504 29924:0dcdccb03ea0