diff libpurple/network.c @ 26124:46434dc43a63

merge of 'a43fe39095ee00967fa35f7fc14ecd698c4b3241' and 'be1f71ec3369834e58cb66cfaa0ac17c03fdbe82'
author Marcus Lundblad <ml@update.uu.se>
date Sat, 10 Jan 2009 01:27:49 +0000
parents a6742d9eadf3
children 75f72178e361 c0b42d6c2785 ae3d25465d0f
line wrap: on
line diff