diff libpurple/connection.c @ 30397:7eeb5a9d1d80

merge of '45c13cbd9c56429c7ed3b9a147b1d76692f3968d' and '55f17462bcdf93474447c4505853b919e1247311'
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 19 May 2010 03:26:38 +0000 (2010-05-19)
parents 378cceb9131d
children 1c20a2115ad4
line wrap: on
line diff