From: Joseph Spiros Date: Wed, 21 Jul 2010 16:55:17 +0000 (-0400) Subject: Merge branch 'master' of git://github.com/melinath/philo X-Git-Tag: philo-0.9~46 X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/11f1c387f944adf710f7fa4614004f0ef9fda29b 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 --- 11f1c387f944adf710f7fa4614004f0ef9fda29b