Merge branch 'develop' of git://github.com/melinath/philo into develop
[philo.git] / philo / templatetags / __init__.py