diff libpurple/proxy.c @ 28127:e47d4bddf974

merge of '3f93a6bb49a0b26675a702b5849dc9e6d2fc0200' and '4bba0dcaaebf221b8408786df7013b2d07b71e9c'
author maiku@pidgin.im
date Fri, 28 Aug 2009 23:27:10 +0000
parents 30497d814cb9
children f2a69bee9ef6
line wrap: on
line diff