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