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