Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/pep.c @ 25802:e3bb0bbfa388
Fix merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Tue, 02 Dec 2008 22:55:49 +0000 |
parents | 4caae7801f4d |
children | 5f9a24d1c25e e1f363f8fd6b 5dd25c58b65e |