# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1228593478 0
# Node ID 333c1f6ece5e29d71452149c2fba1a94ee258488
# Parent  918738a0bba48f5219bb55c73e62500ae2584a2d# Parent  95ef7beb926bae9940cad1924a81e75a455d5ed4
merge of '1203a733696f95eef53b04b5078e0a779371b4d3'
     and '5981a2262230950dadbeac3c56e0b1b7ebc2ae4a'

diff -r 918738a0bba4 -r 333c1f6ece5e libpurple/proxy.c
--- a/libpurple/proxy.c	Sat Dec 06 13:30:06 2008 +0000
+++ b/libpurple/proxy.c	Sat Dec 06 19:57:58 2008 +0000
@@ -621,7 +621,7 @@
 	if (!PURPLE_PROXY_CONNECT_DATA_IS_VALID(connect_data))
 		return;
 
-	purple_debug_info("proxy", "Connected to %s:%d.\n",
+	purple_debug_info("proxy", "Connecting to %s:%d.\n",
 					connect_data->host, connect_data->port);
 
 	/*