diff libpurple/proxy.c @ 18612:56886bde4535

merge of '88e83a787741462b25953d4b5a1c467575657ad0' and 'd660b3efb34dc79a2af00f40d372ad9d07d44e15'
author Mark Doliner <mark@kingant.net>
date Sun, 22 Jul 2007 08:33:49 +0000
parents 79ecaab86f91
children 57d350900136 941965d6fd88
line wrap: on
line diff