Merge branch 'master' into gilbert
[philo.git] / contrib / shipherd / templatetags / __init__.py