# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1592918255 -7200
# Node ID bebb384090b0f66abeaeb26658f456e5528f4972
# Parent  84441c19750e5f26c40f685552dcc921168c6c9f# Parent  801b9d5957a609b4ef2f2425306d530b4b41baea
Merge 0.11->trunk

diff -r 84441c19750e -r bebb384090b0 util/startup.lua
--- a/util/startup.lua	Mon Jun 22 11:35:24 2020 +0100
+++ b/util/startup.lua	Tue Jun 23 15:17:35 2020 +0200
@@ -604,7 +604,6 @@
 	startup.sandbox_require();
 	startup.set_function_metatable();
 	startup.check_dependencies();
-	startup.init_logging();
 	startup.load_libraries();
 	startup.setup_plugindir();
 	-- startup.setup_plugin_install_path();