Merge branch 'julian' of git://github.com/lapilofu/philo
[philo.git] / contrib / shipherd / templatetags / __init__.py