changeset 22421:7ba68075beea

merge of 'e4cc3b79eb04e4937c5fa764f6839a8e07397651' and 'f6f182a65daf42e9f1e50f409e9d965119d3932f'
author Mark Doliner <mark@kingant.net>
date Wed, 05 Mar 2008 18:13:11 +0000
parents 316c8565f562 (current diff) 6eb0749ad46c (diff)
children 04b807c8b98d
files libpurple/proxy.c
diffstat 0 files changed, 0 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff