# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1227832371 0
# Node ID 97f1031d9bd01c532840cda2c542e938d1c4de4a
# Parent  b15dcea02da95dbfd5db50edba159a8c4df519a4# Parent  1b7cb5163b07203437a8493dacc1379a0b38ba92
merge of '2dd22d23da4543b04174ef30edee6b709b5ae552'
     and 'c70716a00a58d785e02237c173d692281a3e94dd'

diff -r b15dcea02da9 -r 97f1031d9bd0 ChangeLog.API
--- a/ChangeLog.API	Fri Nov 28 00:31:28 2008 +0000
+++ b/ChangeLog.API	Fri Nov 28 00:32:51 2008 +0000
@@ -29,8 +29,8 @@
 		Added:
 		* gtk_imhtml_class_register_protocol
 		* gtk_imhtml_link_get_url, gtk_imhtml_link_get_text_tag,
-		  gtk_imhtml_link_activate functions to process GtkIMHtmlLink objects
-		  from GtkIMHtml protocol callbacks.
+		  gtk_imhtml_link_activate functions to process GtkIMHtmlLink
+		  objects from GtkIMHtml protocol callbacks.
 		* pidgin_utils_init, pidgin_utils_uninit
 
 version 2.5.0 (08/18/2008):