Merge branch 'develop' into syndication
[philo.git] / philo / templatetags / __init__.py