diff libpurple/proxy.c @ 26696:3c35dcebefe7

merge of '6bcd7cfc161122f058f5093da0fab2dceeec0cfa' and 'c4834891814ba35fcff3ba313f7afa8eebd4f050'
author Paul Aurich <paul@darkrain42.org>
date Sun, 26 Apr 2009 17:01:05 +0000
parents 4b8c4870b13a
children 4c3b1bb3ba91
line wrap: on
line diff