diff libpurple/proxy.c @ 15826:aabeea8c6c40

merge of '04fd9089e93e64f81bc6caafb8bd7805037cd3ad' and '50462290007872fbc71682021623547dfa477158'
author Nathan Walp <nwalp@pidgin.im>
date Mon, 19 Mar 2007 00:20:29 +0000
parents 14d85ee22d78
children 32c366eeeb99
line wrap: on
line diff