Merge branch 'penfield' of git://github.com/kgodey/philo into penfield
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Jun 2010 15:31:50 +0000 (11:31 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 16 Jun 2010 15:31:50 +0000 (11:31 -0400)
commit77910c8b4d5e1661e53f2a0500fa23654b677c4a
treecb7522a5b5a2fbf0c8b5ca7a9cd28b8ede8f4f67
parentcf2b9630938e8c74f7037adacd2f5f0a4b6f2faa
parent318245a0cb573b9e1b80c21c6a6ffc53ffb548dc
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.