diff libpurple/prpl.c @ 29877:7b712cf17262

merge of '73eedf837c2384f502418f091300785c19ccfacd' and '80ca41a75331b3ca9b4c2a4efa04d72104f4909e'
author Paul Aurich <paul@darkrain42.org>
date Tue, 04 May 2010 02:22:31 +0000
parents 31a34388fb1d
children a8cc50c2279f
line wrap: on
line diff