Merge branch 'gilbert' into gilbert-1.3
[philo.git] / templatetags / __init__.py