pidgin.next.minor: 6cd74e60: Add two changes to the change log

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 6cd74e604bada1e976b7f77d541035c2a760fb56
Ancestor: 6195ce7967cb0651ad4582ba1d5ade7c47a3ba87
Author: markdoliner at pidgin.im
Date: 2009-01-26T06:35:37
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/6cd74e604bada1e976b7f77d541035c2a760fb56

Modified files:
        ChangeLog

ChangeLog: 

Add two changes to the change log

-------------- next part --------------
============================================================
--- ChangeLog	d5d4bd8be56ca5e37d140e0bb32c9e67a2a88041
+++ ChangeLog	92bd0ec72628fa037d8f4e98838e856d60de875c
@@ -5,6 +5,11 @@ version 2.6.0 (??/??/????):
 	* 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