Mercurial > pidgin
diff libpurple/protocols/jabber/xdata.c @ 32795:a359399cc0ce
merge of '22d544ffc6215f22b81d1dc34931bad4c82775c2'
and '886d323c01f7c8cdf2a5e4ff42eefbab045b1f1f'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 06 May 2012 17:52:46 +0000 |
parents | 7fb775b4465b |
children |