diff libpurple/protocols/jabber/pep.c @ 22819:42dfa1139b5c

merge of '21d37789f674809d615fc7676a092f1da438b0f5' and 'aafbbc317ab5f69e31e0bb6cabc264bb70745ef2'
author Evan Schoenberg <evan.s@dreskin.net>
date Fri, 02 May 2008 22:51:14 +0000
parents 680a3aea5eb6
children aaaff38e144f 4caae7801f4d 26eabe8e739b
line wrap: on
line diff