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

Fix merge
author Marcus Lundblad <ml@update.uu.se>
date Tue, 02 Dec 2008 22:55:49 +0000
parents 44b4e8bd759b
children 89c4edb5e545
line wrap: on
line diff