Merge remote-tracking branch 'upstream/master'
tree8693931cfca1961ac0ff227325d8521ea55a3e84
-rw-r--r-- 6130 .gitignore
-rw-r--r-- 2135 README.md
drwxr-xr-x - htdocs
drwxr-xr-x - plugins
drwxr-xr-x - src