comparison libpurple/network.c @ 25881:ca01403251f1

explicit merge of 'dabe77d56a2fc7c171caa81bd12d72ce8737a7a8' and 'b299a165920a9d922e9b8c27b4c879c77b43efe1'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 21:47:52 +0000
parents b38cbefca6ad
children c0b42d6c2785
comparison
equal deleted inserted replaced
25880:be87547aa431 25881:ca01403251f1