From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 11 Aug 2010 20:10:54 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~41
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/a10d536d08f92d270e9ddcb240b7eded89d0e707

Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Paginator returns page.object_list as objects if a page exists.
  Implements render_to_string on Page model for cases where this is used to render i.e. emails (Feature #18)
  Unimplemented PaginationProxy; moved pagination from penfield to core.
  Multiview will now pass node and extra_context to any view that takes kwargs. Fixes bug #10
  Added forgotten import of EmptyPage.
  Introduced the PaginationProxy object to simplify use in templates.
  Revised penfield's pagination helper to work more generically.
---

a10d536d08f92d270e9ddcb240b7eded89d0e707