From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Wed, 16 Jun 2010 15:31:50 +0000 (-0400)
Subject: Merge branch 'penfield' of git://github.com/kgodey/philo into penfield
X-Git-Tag: philo-0.9~67^2~12
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/77910c8b4d5e1661e53f2a0500fa23654b677c4a

Merge branch 'penfield' of git://github.com/kgodey/philo into penfield

* 'penfield' of git://github.com/kgodey/philo:
  The index template gets a queryset of entries now.
  Fixed date ordering.
  Fixed blog entries plural and ordering.
---

77910c8b4d5e1661e53f2a0500fa23654b677c4a