From: Chris Nehren <apeiron@cpan.org>
Date: Mon, 21 Jun 2010 19:33:58 +0000 (-0400)
Subject: Merge branch 'master' of git.moose.perl.org:gitosis-admin
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0af1b87952dc57af9c22256ec2414eacb29dd0a2;p=p5sagit%2Fgitosis-admin.git

Merge branch 'master' of git.moose.perl.org:gitosis-admin

Conflicts:
	gitosis.conf
---

0af1b87952dc57af9c22256ec2414eacb29dd0a2
diff --cc gitosis.conf
index 72ba758,948c14b..e4eddd0
--- a/gitosis.conf
+++ b/gitosis.conf
@@@ -23,7 -23,7 +23,8 @@@ writable 
    Devel-Declare-Keyword
    local-lib
    Excel-Template
+   p5-mst-13.2
 +  Promulger
  
  [group corehackers]