Merge branch 'gilbert' of git://github.com/lapilofu/philo into gilbert
[philo.git] / contrib / penfield / templatetags / __init__.py