comparison libpurple/proxy.c @ 23008:d3aace801919

merge of '7fd8869cd12ef6b1c4626baf0eb69f81b9564cea' and 'ccdabeaac8ea742c2a9f7d57d2d3b867ce37cb90'
author Ethan Blanton <elb@pidgin.im>
date Mon, 19 May 2008 22:11:41 +0000
parents 5a0186edda97
children d0f933c88fc6 1c7896012802
comparison
equal deleted inserted replaced
22940:9809516e0032 23008:d3aace801919