Merge branch 'hotfix/oberlin_references' into taggit
[philo.git] / philo / contrib / shipherd / templatetags / __init__.py