Merge branch 'master' of https://github.com/torchbox/wagtail

Conflicts:
	CHANGELOG.txt
	docs/releases/1.2.rst

CHANGELOG.txt

@@ -35,6 +35,7 @@ Changelog
  * Fix: The "view live" button displayed after publishing a page now correctly reflects any changes made to the page slug (Ryan Pineo)
  * Fix: API endpoints now accept and ignore the `_` query parameter used by jQuery for cache-busting
  * Fix: Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
+ * Fix: Searching a specific page model while filtering it by either ID or tree position no longer raises an error (Ashia Zawaduk)
  * Fix: Scrolling an over-long explorer menu no longer causes white background to show through (Alex Gleason)
 
 1.1 (15.09.2015)

CONTRIBUTORS.rst

@@ -74,6 +74,7 @@ Contributors
 * Petr Vacha
 * Josh Barr
 * Sævar Öfjörð Magnússon
+* Ashia Zawaduk
 
 
 Translators

docs/releases/1.2.rst

@@ -82,6 +82,7 @@ Bug fixes
  * The "view live" button displayed after publishing a page now correctly reflects any changes made to the page slug (Ryan Pineo)
  * API endpoints now accept and ignore the ``_`` query parameter used by jQuery for cache-busting
  * Page slugs are no longer cut off when Unicode characters are expanded into multiple characters (Sævar Öfjörð Magnússon)
+ * Searching a specific page model while filtering it by either ID or tree position no longer raises an error (Ashia Zawaduk)
  * Scrolling an over-long explorer menu no longer causes white background to show through (Alex Gleason)
 
 Upgrade considerations