comparison libpurple/purple-client.c @ 21031:afb4704781ed

merge of '74f5f273ea24887c8df0384ce8795613dfbbd7ee' and 'df5eddde2a5d7ede22d8136c865b525bf6c0c677'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 27 Oct 2007 17:47:48 +0000
parents d4464c354346
children 48d09d62912e
comparison
equal deleted inserted replaced
21023:42ecde230f91 21031:afb4704781ed