# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1232951737 0
# Node ID 860d0c98d67db3b3287a17dcfc68ebf1b0db7f3a
# Parent  d25cbbea7fe5b8798814396ea0a1254691493188
Add two changes to the change log

diff -r d25cbbea7fe5 -r 860d0c98d67d ChangeLog
--- a/ChangeLog	Mon Jan 26 06:18:18 2009 +0000
+++ b/ChangeLog	Mon Jan 26 06:35:37 2009 +0000
@@ -5,6 +5,11 @@
 	* Theme support in libpurple thanks to Justin Rodriguez's summer of code
 	  project.  With some minor additions and clean ups from Paul Aurich.
 
+	Pidgin:
+	* Added -f command line option to tell Pidgin to ignore NetworkManager
+	  and assume it has a valid network connection.
+	* Allow plugins to specify custom link types to the GtkIMHtml widget.
+
 version 2.5.5 (??/??/????):
 	libpurple:
 	* Fix transfer of buddy icons, custom smileys and files from the