diff libpurple/connection.c @ 31952:e4ae42f9da68

merge of 'b11803e108556a29e1204a3ff1fd00a0890d7733' and 'da7bc1419142f97b2def127ef42c9c7c562e77e3'
author andrew.victor@mxit.com
date Wed, 24 Aug 2011 06:45:30 +0000
parents a5b556ac1de5
children 2571b01e849c 3828a61c44da
line wrap: on
line diff