diff libpurple/protocols/jabber/roster.c @ 26045:62b41bb71a60

merge of '36ce4dcc4d637d6227ef52b2e9e72f957f0435ff' and 'fc5fe0f88226b374c4d42d65ed90e97a059f4d0f'
author Marcus Lundblad <ml@update.uu.se>
date Tue, 13 Jan 2009 09:00:57 +0000
parents fae699fece1f
children 6d6e10476c52 e9b7e41dc816 050052891c55 0331bc480515
line wrap: on
line diff