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

diff --combined gitosis.conf
index 4d675cc,31ea04a..f3fc4af
--- 1/gitosis.conf
--- 2/gitosis.conf
+++ b/gitosis.conf
@@@ -27,6 -27,7 +27,7 @@@
  
  [gitosis]
  
+ 
  [group gitosis-admin]
  writable = gitosis-admin
  members = zanchey@ucc trs80@ucc shmookey@ucc dja@ucc frenchie@ucc spartan@ucc atyndall@ucc matches@ucc sjy@ucc gozzarda@ucc oxinabox@ucc [email protected] rvvs89@ucc sulix@ucc mtearle@ucc bob@ucc nick@ucc 
@@@ -61,7 -62,7 +62,7 @@@ daemon = ye
  
  [group uccvend]
  writable = uccvend-docs uccvend-vendserver uccvend-snackrom uccvend-cokecode uccvend-vagrant
 -members = mtearle@ucc [email protected] coffee@ucc.asn.au
 +members = mtearle@ucc [email protected] coffee@ucc
  
  [repo uccvend-docs]
  daemon = yes