# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1601455833 -3600
# Node ID b2331f3dfeeaaa9bde252db72730ef680d41dc7f
# Parent  68df52bf08d5229e179f0aa3508ea0fd6457f6ac# Parent  d334f2bebe552a54e6caface56529d94eff0924c
Merge 0.11->trunk

diff -r d334f2bebe55 -r b2331f3dfeea .hgtags
--- a/.hgtags	Wed Sep 30 07:25:32 2020 +0100
+++ b/.hgtags	Wed Sep 30 09:50:33 2020 +0100
@@ -73,3 +73,5 @@
 10d6d0d91f4ec47a6eb446792fee1d4b79a914d7 0.11.4
 dbd60f47316492bc367802914dc8fa47f4b3edac 0.11.5
 bacca65ce107b8549ce5f9079e81e5771eed2021 0.11.6
+0000000000000000000000000000000000000000 0.11.7
+ece430d4980997b216c2240015bf922bdeb12dd6 0.11.7
diff -r d334f2bebe55 -r b2331f3dfeea net/http/files.lua
diff -r d334f2bebe55 -r b2331f3dfeea plugins/mod_c2s.lua
diff -r d334f2bebe55 -r b2331f3dfeea plugins/mod_s2s.lua