Merge remote-tracking branch 'upstream/master' into dean001
tree970d5ab84cf51641f254d0872d3f20f9bbc945b9
-rw-r--r-- 6130 .gitignore
-rw-r--r-- 125 README
drwxr-xr-x - htdocs
drwxr-xr-x - plugins
drwxr-xr-x - src