Merge branch 'shipherd_hotfix'
[philo.git] / contrib / shipherd / templatetags / __init__.py