Merge branch 'master' of git.moose.perl.org:gitosis-admin
Chris Nehren [Mon, 21 Jun 2010 19:33:58 +0000 (15:33 -0400)]
Conflicts:
gitosis.conf

1  2 
gitosis.conf

diff --cc gitosis.conf
@@@ -23,7 -23,7 +23,8 @@@ writable 
    Devel-Declare-Keyword
    local-lib
    Excel-Template
+   p5-mst-13.2
 +  Promulger
  
  [group corehackers]