From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Mon, 5 Jul 2010 18:32:27 +0000 (-0400)
Subject: Merge branch 'master' of git://github.com/kgodey/philo
X-Git-Tag: philo-0.9~57
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/776f7c515dfb9019906dfb7dd5d9f78182add931

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.
---

776f7c515dfb9019906dfb7dd5d9f78182add931