diff libpurple/buddyicon.c @ 24974:93cc8982d4e5

explicit merge of '094ca19cc431d185c7b94947bfcd7cfc2d2f4a0b' and 'a92ecd05b30230b85149a7c4edbcb269bc1c4841'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Sat, 13 Dec 2008 08:48:58 +0000
parents 8282911d5e17
children 9c0337d4b878 5ebfa814b9e8
line wrap: on
line diff