Merge commit 'c16fa9412ca9760759fa0357278c3bf8e065959d'

diff --cc cgilite/cgilite.awk
index 0000000000000000000000000000000000000000,f16ed6a3281746d6182cd4f340eb15910f6c5a87..f16ed6a3281746d6182cd4f340eb15910f6c5a87
mode 000000,100644..100644
--- /dev/null
--- 2/cgilite.awk
+++ b/cgilite/cgilite.awk

diff --cc cgilite/cgilite.sh
Simple merge

diff --cc cgilite/common.css
Simple merge

diff --cc cgilite/db23.sh
index 0000000000000000000000000000000000000000,e8a0d64da8bf0b15c7c74398fe7200d68ad16680..e8a0d64da8bf0b15c7c74398fe7200d68ad16680
mode 000000,100755..100755
--- /dev/null
--- 2/db23.sh
+++ b/cgilite/db23.sh

diff --cc cgilite/file.sh
Simple merge

diff --cc cgilite/html-sh.sed
Simple merge

diff --cc cgilite/json.sh
index 0000000000000000000000000000000000000000,12afdc4d676b94b705b0c165fee2512c80891cb9..12afdc4d676b94b705b0c165fee2512c80891cb9
mode 000000,100755..100755
--- /dev/null
--- 2/json.sh
+++ b/cgilite/json.sh

diff --cc cgilite/markdown.awk
Simple merge

diff --cc cgilite/session.sh
Simple merge

diff --cc cgilite/storage.sh
Simple merge

diff --cc cgilite/users.sh
Simple merge