Merge branch 'master' of git://github.com/kgodey/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 5 Jul 2010 18:32:27 +0000 (14:32 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Mon, 5 Jul 2010 18:32:27 +0000 (14:32 -0400)
commit776f7c515dfb9019906dfb7dd5d9f78182add931
treefeac81e01c558636a13a9040d64e41be13fda5a6
parent94f98261589e880ef15d17809112c0615d57b983
parentcc2232ac1fe0497203e386521cb91c01c83060ea
Merge branch 'master' of git://github.com/kgodey/philo

* 'master' of git://github.com/kgodey/philo:
  Fixed null constraint on entries_per_page in BlogView
  Edited unicode methods and added some null=True, blank=True constraints.