Merge branch 'master' of git://git.ucc.asn.au/gitosis-admin

diff --combined gitosis.conf
index b31f30d,e619d62..6307dc1
--- 1/gitosis.conf
--- 2/gitosis.conf
+++ b/gitosis.conf
@@@ -25,14 -25,14 +25,14 @@@
  
  [group gitosis-admin]
  writable = gitosis-admin
- members = zanchey@ucc trs80 shmookey dja@ucc
+ members = zanchey@ucc trs80 shmookey@ucc dja@ucc
  
  [repo gitosis-admin]
  daemon = yes
  
  [group www-data]
  writable = ucc-www
- members = zanchey@ucc trs80 shmookey www-data
+ members = zanchey@ucc trs80 shmookey@ucc www-data
  
  [repo ucc-www]
  daemon = yes
@@@ -58,10 -58,3 +58,10 @@@ members = zanchey@uc
  
  [repo uccdoor]
  daemon = yes
 +
 +[group webdispense]
 +writable = webdispense
 +members = shmookey@ucc
 +
 +[repo webdispense]
 +daemon = yes