Merge proposals dependent on lp:~ericmoritz/django-pennypress/basecontent

lp:~ericmoritz/django-pennypress/basecontent has no merge proposals.