Merge branch 'shipherd_hotfix' into release
[philo.git] / philo / contrib / julian / __init__.py