diff libpurple/connection.h @ 22229:ae5917260eac

merge of '9d22bc3a3d82cb26e7196d41b472b81c7660274d' and 'f6e17bf35872d70d9ebba4cf860470a5b21d54ce'
author Jeffrey Connelly <jaconnel@calpoly.edu>
date Tue, 29 Jan 2008 01:51:26 +0000
parents ef0e82b8bc2e
children 9aa105267f46
line wrap: on
line diff