diff libpurple/core.c @ 25316:fb0340112a64

merge of '74c268c89bbcb796bd93e892d622370cf996ae77' and '86f401028e5edbd8613c5d956c9158234da40670'
author Paul Aurich <paul@darkrain42.org>
date Mon, 12 Jan 2009 18:30:57 +0000
parents 1563f269a714
children cf8c060cdd25 114e66c2fa7e 94a6eb10c691
line wrap: on
line diff