diff libpurple/proxy.c @ 24647:34b02adafd9b

merge of 'dd536145a4036177cabc4e4e1ac83dcdf1008a33' and 'fdb452e89c3d4140034ff12f06a8c3daf350ae5d'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Thu, 11 Dec 2008 22:36:47 +0000
parents f3103f786c86
children 95ef7beb926b 9bc0c3274c3c
line wrap: on
line diff