Merge branch 'taggit' into develop
[philo.git] / philo / contrib / penfield / templatetags / __init__.py