Merge branch 'master' of git://github.com/melinath/philo
authorJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 21 Jul 2010 16:55:17 +0000 (12:55 -0400)
committerJoseph Spiros <joseph.spiros@ithinksw.com>
Wed, 21 Jul 2010 16:55:17 +0000 (12:55 -0400)
commit11f1c387f944adf710f7fa4614004f0ef9fda29b
tree0d8baa7e5161c82638da9461a2eafcfb12f7373a
parentbcaf02b09b921364261bd186781f3ff1593fbee0
parent60e2eb95e67aeaf65ff7efb37851adae518df92b
Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Membersof now uses 'app_label.model'; removed blockcontainer
  Slight changes to penfield NewsletterIssueAdmin & added newsletter value models