Conflicts:

docs/releases/index.rst

CHANGELOG.txt

@@ -1,7 +1,6 @@
 Changelog
 =========
 
-
 0.9 (xx.xx.xxxx)
 ~~~~~~~~~~~~~~~~
 
@@ -12,6 +11,11 @@ Changelog
  * When copying pages, it is now possible to specify a place to copy to (Timo Rieber)
 
 
+0.8.5 (xx.xx.20xx)
+~~~~~~~~~~~~~~~~~~
+* Fix: On adding a new page, the available page types are ordered by the displayed verbose name
+
+
 0.8.4 (04.12.2014)
 ~~~~~~~~~~~~~~~~~~
 
@@ -19,7 +23,6 @@ Changelog
 * Fix: Page IDs in page revisions were not updated on page copy, causing subsequent edits to be committed to the original page instead
 * Fix: Copying a page now creates a new page revision, ensuring that changes to the title/slug are correctly reflected in the editor (and also ensuring that the user performing the copy is logged)
 * Fix: Prevent a race condition when creating Filter objects
-* Fix: On adding a new page, the available page types are ordered by the displayed verbose name
 
 
 0.8.3 (18.11.2014)

docs/releases/0.8.5.rst

@@ -0,0 +1,16 @@
+============================================
+Wagtail 0.8.5 release notes - IN DEVELOPMENT
+============================================
+
+.. contents::
+    :local:
+    :depth: 1
+
+
+What's new
+==========
+
+Bug fixes
+~~~~~~~~~
+
+ * On adding a new page, the available page types are ordered by the displayed verbose name

docs/releases/index.rst

@@ -6,6 +6,7 @@ Release notes
 
    roadmap
    0.9
+   0.8.5
    0.8.4
    0.8.3
    0.8.1