diff libpurple/connection.c @ 30443:f228c946a5bc

merge of '17e496a18cf8462d267f5220dd5f6283662eeba7' and 'c6846e134f765c0da81a81bb60301dedcbb0d4fe'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 25 Aug 2010 19:12:08 +0000
parents 1c20a2115ad4
children 53f51201b39f
line wrap: on
line diff