Merge commit '3283127e9544b8877250bde29ddfa5c4ec309a04'

diff --cc cgilite/markdown.awk
index 0000000000000000000000000000000000000000,512be5d5723da1f9a049bb1ba31241d813dba5ac..512be5d5723da1f9a049bb1ba31241d813dba5ac
mode 000000,100755..100755
--- /dev/null
--- 2/markdown.awk
+++ b/cgilite/markdown.awk

diff --cc cgilite/session.sh
Simple merge