diff libpurple/proxy.c @ 16695:4a020cf5942d

merge of '45bdc7f0cf3d3c9229f3fcd9de71b882131c05c0' and '8ce6e4b908249fabc820ae1eb512cc4ee075282a'
author Richard Laager <rlaager@wiktel.com>
date Mon, 30 Apr 2007 00:45:01 +0000
parents 4999bbc52881
children f1547260a11e
line wrap: on
line diff