# HG changeset patch
# User tmolitor <thilo@eightysoft.de>
# Date 1636292503 -3600
# Node ID ea1ecbc1d04d4e11f06d270a1d3e0bb37a7ea0ba
# Parent  367a8020bd92580c0772ee00bbd6171e67ee9293# Parent  f649305d0bece7138351adf2fc655541c7528fd8
Merge commit

diff -r 367a8020bd92 -r ea1ecbc1d04d mod_admin_web/README.markdown
--- a/mod_admin_web/README.markdown	Sun Nov 07 14:40:41 2021 +0100
+++ b/mod_admin_web/README.markdown	Sun Nov 07 14:41:43 2021 +0100
@@ -28,7 +28,7 @@
 1.  Copy the admin\_web directory into a directory Prosody will check
     for plugins. (cf. [Installing
     modules](http://prosody.im/doc/installing_modules))
-2.  Execute the contained get\_deps.sh script from within the admin\_web
+2.  Execute the contained `get_deps.sh` script from within the admin\_web
     directory. (Requires wget, tar, and a basic shell)
 
 Configuration Details
diff -r 367a8020bd92 -r ea1ecbc1d04d mod_measure_malloc/mod_measure_malloc.lua
--- a/mod_measure_malloc/mod_measure_malloc.lua	Sun Nov 07 14:40:41 2021 +0100
+++ b/mod_measure_malloc/mod_measure_malloc.lua	Sun Nov 07 14:41:43 2021 +0100
@@ -25,7 +25,7 @@
 ):with_labels();
 
 module:hook("stats-update", function ()
-	meminfo = pposix.meminfo();
+	local meminfo = pposix.meminfo();
 	if meminfo.allocated then
 		allocated:with_labels("sbrk"):set(meminfo.allocated);
 	end