# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1720704357 -7200
# Node ID 05f028de4c451f44602b964a400fe0f9d4409afc
# Parent  1f93e4f78c53218e23a2468dc91f25b6be1911d6# Parent  997d9ad12477aec51df011c3900fc8ef4696a6e7
Merge 0.12->trunk

diff -r 1f93e4f78c53 -r 05f028de4c45 teal-src/prosody/util/xtemplate.tl
diff -r 1f93e4f78c53 -r 05f028de4c45 util/xtemplate.lua