diff libpurple/proxy.c @ 31953:e86e00f77ca4

merge of '832455fec73731ef93c992a46f78b79981bb4105' and '9d78a21f49219b234b21c2dd2023c4ad160a2c9c'
author andrew.victor@mxit.com
date Thu, 25 Aug 2011 06:40:04 +0000
parents 5498ee1aa30b
children f22bc8b5b9dc 9f26efb70c67 3828a61c44da
line wrap: on
line diff