Merge branch 'master' of /srv/git.pseudorandom.co.uk/git/git.pseudorandom.co.uk/admin
-rw-r--r-- 8 .gitignore
-rw-r--r-- 431 Makefile
-rw-r--r-- 1304 apache.conf
drwxr-xr-x - cgi-bin
drwxr-xr-x - git
-rw-r--r-- 719 gitweb.conf
drwxr-xr-x - hooks
-rw-r--r-- 79 install.lst
drwxr-xr-x - res
drwxr-xr-x - www