# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1600544964 -3600
# Node ID 3473bc8d80c909d0e88df845b79f237269d962c8
# Parent  f7f30a3464fe515bc40f916673a7421e365924a8# Parent  5691b9773c5b96769916cf14697a5a2881960b56
Merge 0.11->trunk

diff -r f7f30a3464fe -r 3473bc8d80c9 util/startup.lua