diff libpurple/protocols/jabber/libxmpp.c @ 25228:6fed1bb3b02e

Fix merge
author Marcus Lundblad <ml@update.uu.se>
date Wed, 17 Dec 2008 18:23:36 +0000
parents 8e7e6f60e053
children 0700833f0c5d 25e2ab1fff1d e1f363f8fd6b b4a2ce33b3d5 c974d4453f12
line wrap: on
line diff