diff libpurple/proxy.c @ 28423:fd2dd4039cb4

merge of 'a89c814a0c81eeacde296ce6a2520f1bac083ba4' and 'b15f3e0335356e294b5b83fd8ad94b8f10cf76c2'
author Richard Laager <rlaager@wiktel.com>
date Sat, 22 Aug 2009 23:42:31 +0000
parents 32a707746454
children 30497d814cb9
line wrap: on
line diff