Merge branch 'master' of git.moose.perl.org:gitosis-admin
authorChris Nehren <apeiron@cpan.org>
Mon, 21 Jun 2010 19:33:58 +0000 (15:33 -0400)
committerChris Nehren <apeiron@cpan.org>
Mon, 21 Jun 2010 19:33:58 +0000 (15:33 -0400)
commit0af1b87952dc57af9c22256ec2414eacb29dd0a2
tree1cce23b09880acfc617eb24145ab03a6aa6ac12f
parent148da6fe2dccbeec45861d4445dc33da5a8dd973
parenta450e26cc616bd474b27a1a745761207def8b326
Merge branch 'master' of git.moose.perl.org:gitosis-admin

Conflicts:
gitosis.conf
gitosis.conf