Merge branch 'master' into penfield, cleaned up.
[philo.git] / templatetags / __init__.py