merge upstream
tree745c2233ad94d6e88b7d9a9009e0e6a022454fba
-rw-r--r-- 6130 .gitignore
-rw-r--r-- 2135 README.md
drwxr-xr-x - htdocs
drwxr-xr-x - plugins
drwxr-xr-x - src