----------------------------
* Reformatted docs to lines less than 80 chars - stephenmcd
* Revert some of ``mezzanine.settings`` back to not being overridable - stephenmcd
* Added routine to sphinx ``conf.py`` to auto-generate docs for ``mezzanine.settings`` - stephenmcd
* Prevent sphinx blank-line warning - stephenmcd
* Make building docs ``Python2.5`` compatible - stephenmcd
* Bugfix for losing parent ID when editing existing child pages - stephenmcd
* fix bug with ordering field in pages. Add error handling for page ordering - lexual