Merge branch 'cleanup'
[philo.git] / templatetags / __init__.py