Merge branch 'shipherd_hotfix' into release
[philo.git] / docs / dummy-settings.py