diff libpurple/protocols/jabber/iq.c @ 25802:e3bb0bbfa388

Fix merge
author Marcus Lundblad <ml@update.uu.se>
date Tue, 02 Dec 2008 22:55:49 +0000
parents 040c66dffbf0
children e30e9779e7bf 45dbea660309 b5052c66701c bcad7dc4b453
line wrap: on
line diff