Merge remote-tracking branch 'ithinksw/develop' into develop
[philo.git] / philo / templatetags / __init__.py