comparison libpurple/purple-client.c @ 32385:ab89526a96aa

merge of '3a7408265d339b20bd3bef7b8fefc62215ccf644' and '3bdddc2619d93c794865a2e3ebf7f03a58929381'
author Mark Doliner <mark@kingant.net>
date Mon, 22 Aug 2011 16:18:10 +0000
parents 48d09d62912e
children
comparison
equal deleted inserted replaced
32383:e44af4d2e01b 32385:ab89526a96aa