diff libpurple/proxy.c @ 32524:0c2efa69492b

propagate from branch 'im.pidgin.pidgin.2.x.y' (head 9e9d09486a04f5adb2e51b0f5aada69a9b053e93) to branch 'im.pidgin.pidgin' (head 3817e0ac811feb336fd6e4b205e3f8d873a3974a)
author Mark Doliner <mark@kingant.net>
date Sat, 18 Feb 2012 23:26:02 +0000
parents f07501af8bae 9f26efb70c67
children fa666e7f747e
line wrap: on
line diff