Merge branch 'docs' into release
[philo.git] / philo / templatetags / __init__.py