# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1219806402 0
# Node ID c241bc48c962a5ff6d72c8ce0817a6837079445f
# Parent  18a1f0fe5f40a496b68e1bdd2c36898818597bdb# Parent  11f98b1e605baf185edb04e97c67605537d5f923
merge of '6404d7635dd48f315b3c8fd3550970a417daa2ef'
     and '97fa95e12dee764fb786a1cb1b06c7c259bfda48'

diff -r 18a1f0fe5f40 -r c241bc48c962 libpurple/certificate.c
--- a/libpurple/certificate.c	Wed Aug 27 02:52:50 2008 +0000
+++ b/libpurple/certificate.c	Wed Aug 27 03:06:42 2008 +0000
@@ -1485,7 +1485,7 @@
 
 	if (!tls_peers) {
 		purple_debug_error("certificate/x509/tls_cached",
-				   "Couldn't find local peers cache %s\nPrompting the user\n",
+				   "Couldn't find local peers cache %s\n",
 				   tls_peers_name);