Merge pull request #3832 from yakky/feature/fix_changelog

Fix Changelog

CHANGELOG.txt

@@ -292,10 +292,7 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - Added list of retired core developers
 - Added branch policy documentaion
 
-<<<<<<< HEAD
-=== 3.1 (unreleased) ===
-=======
-=== 3.0.8 (2015-01-11) ===
+==== 3.0.8 (2015-01-11) ===
 - Add require_parent option to CMS_PLACEHOLDER_CONF
 - Fix django-mptt version depenency to be PEP440 compatible
 - Fix some Django 1.4 compatibility issues
@@ -309,9 +306,12 @@ Please see Install/2.4 release notes *before* attempting to upgrade to version 2
 - Documentation fixes
 - Minor code cleanups
 
-=== 3.0.9 (2015-01-11) ===
+==== 3.0.9 (2015-01-11) ===
 - Revert a change that caused a regression in toolbar login
 - Fix an error in a translated phrase
 - Fix error when moving items in the page tree
 
->>>>>>> upstream/support/3.0.x
+==== 3.1 (unreleased) ===
+- Removed django-mptt in favor of django-treebeard
+- Removed compatibility with Django 1.4 / 1.5
+- General code cleanup