Merge commit 'e57596485bb80d4c2583244a9f21487dce89bd7c'

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

diff --cc cgilite/common.css
Simple merge

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

diff --cc cgilite/file.sh
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/storage.sh
Simple merge

diff --cc cgilite/tests-markdown.sh
index 0000000000000000000000000000000000000000,6df4224d131d6beb7d2f1cab50ab2953517f18aa..6df4224d131d6beb7d2f1cab50ab2953517f18aa
mode 000000,100755..100755
--- /dev/null
--- 2/tests-markdown.sh
+++ b/cgilite/tests-markdown.sh

diff --cc cgilite/users.sh
Simple merge