Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	(revision 270)
+++ trunk/CHANGELOG	(revision 271)
@@ -10,6 +10,16 @@
 # = Bugfix
 ! = Update/Change
 
+------------------------------------- 2.6.1 -------------------------------------
+12-Dec-2005 Ryan Djurovich
+#	Fixed security vulnerability in class.login.php
+#	Fixed typo in EN language file
+#	Fixed captcha problems (when feature is disabled) in form module and sign-up
+!	Added charset encoding to admin templates
+!	Added extra code to check for selection of addon upon uninstalling
+#	Fixed bugs in RSS news feeder
+#	Fixed bug with PAGE_DESCRIPTION not being set on any page
+
 ------------------------------------- 2.6.0 -------------------------------------
 28-Nov-2005 Ryan Djurovich
 +	Added default charset option to (advanced) settings
Index: trunk/wb/config.php
===================================================================
--- trunk/wb/config.php	(revision 270)
+++ trunk/wb/config.php	(revision 271)
@@ -1 +0,0 @@
-<?php ?>
\ No newline at end of file
