diff libpurple/connection.c @ 30112:0a3490f24e2b

merge of '3083d5a5d5b46193be6849e67ddef5bb26111789' and 'b14459623a35c6926c2e383067d203bff65fd06f'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 28 May 2010 06:24:47 +0000
parents 378cceb9131d
children 1c20a2115ad4
line wrap: on
line diff