diff libpurple/proxy.c @ 19950:c5e55b596d1e

explicit merge of '340d730b1b1e1164ee9eab77968ffd03cdf4996e' and '3d09514342c28c798103b050651727e19709c903'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sat, 01 Dec 2007 01:48:26 +0000
parents 79ecaab86f91
children 57d350900136 941965d6fd88
line wrap: on
line diff