--- mambo/branches/4.6/CHANGELOG.php	2006/01/21 16:20:19	157
+++ mambo/branches/4.6/CHANGELOG.php	2006/01/22 08:11:16	163
@@ -26,7 +26,12 @@
 - -> Removed
 ! -> Note
 
--------------------- 4.6 Release --------------------------
+-------------------- 4.6 Release --------------------------
+
+22-Jan-2006 Chad Auld (cauld)
++ Adding MOStlyCE as the new default editor for Mambo
+! Updated the version.php file for release
+# Some merge artifacts were left in index.php causing failures, cleaned them up
 
 20-Jan-2006 Martin Brampton (counterpoint)
 ! Modified index.php to derive live site from $_SERVER