# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1230882124 0
# Node ID f977d7dfd1a0cf3a63daaa8f55428c662260451e
# Parent  0ea515a3f70c47bf42132f3dde463927617a498a# Parent  b2206f3b8b24ab7d9ffd615082f46fd9daa96e0a
merge of '5a35c52faacfbdaf503309fcdf10842cfd126c3f'
     and 'ba6f2a0aa47088afe04b45a8eafd245fa72c9985'

diff -r 0ea515a3f70c -r f977d7dfd1a0 libpurple/proxy.c
--- a/libpurple/proxy.c	Thu Jan 01 23:17:11 2009 +0000
+++ b/libpurple/proxy.c	Fri Jan 02 07:42:04 2009 +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);
 
 	/*