For use in direct template pages, the {% render_content_area %} tag can take the page as an object or a look-up slug.
[#13] Use @condition decroator on edit_pagelet view, with both last-modified and etag callbacks.
Merge branch 'master' into develop
Update release notes for changes on develop
Merge remote-tracking branch 'origin/master' into develop
Clarify release note

Thanks @ironfroggy!
Merge pull request #52 from caktus/develop

Merge develop into master
Merge branch 'master' into django-1.6

Conflicts:
	docs/releases.rst