Merge commit 'cc5158ef10a20472c864a93489baba72e2656eaf'

diff --cc cgilite/db23.sh
Simple merge

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

diff --cc cgilite/users.sh
Simple merge