Merge shizeeg's branch with main
tree0e11d4110696b648957ed18ac3fd5e324be01175
-rw-r--r-- 579 .hgignore
-rw-r--r-- 1452 .hgsigs
drwxr-xr-x - mcabber