diff libpurple/proxy.c @ 28258:25ad8f6b2638

merge of 'ce714031f3cafbcbd99cc3988cbb9cacd3ada236' and 'f6ccaee21b84f421b31d614cb5c06c855ab47e0b'
author Etan Reisner <pidgin@unreliablesource.net>
date Fri, 14 Aug 2009 00:37:34 +0000
parents 32a707746454
children 30497d814cb9
line wrap: on
line diff