Merge branch 'master' of dbsrgits@jules.scsys.co.uk:gitosis-admin
-rw-r--r-- gitosis.conf
drwxr-xr-x keydir