diff libpurple/purple-client.c @ 29614:24b7fa9c0c8b

merge of '4f0c3aedc3b013ab2175e57b71bab92988e4f812' and 'fe4644296ed29ff3456121616137d3b6c04d9ee8'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 19 Mar 2010 02:44:22 +0000
parents 48d09d62912e
children
line wrap: on
line diff