diff libpurple/buddyicon.c @ 19120:b25cb0775be3

explicit merge of 'e53fe113efde971f9f1d14d8a7af937542ee2732' and 'fac895a331d8ffa475b42a0eaf193587799661b9'
author Eric Polino <aluink@pidgin.im>
date Thu, 28 Jun 2007 03:09:03 +0000
parents 926ccb104da0
children 44b4e8bd759b
line wrap: on
line diff