diff libpurple/proxy.c @ 22282:f8dde302fcb2

merge of '74350098695c8021af246fd51aa5389109e8fa3b' and '956f3b4fffefc5833167f00438fc7d72366562a3'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Sat, 09 Feb 2008 09:04:39 +0000
parents 35b4f1dc4c8d
children 01e814b7556b
line wrap: on
line diff