diff libpurple/core.c @ 26280:02861ee5b29b

merge of 'a2ba1fead74d00991a9b2fe1290f7716b1d9d5cf' and 'b434abf35e2efd2a1c2821cbaf1ff557219ba4ad'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 16 Mar 2009 02:59:37 +0000
parents 8c8948b9f602
children 6b0c6a370cda
line wrap: on
line diff