From: Florian Ragwitz <rafl@debian.org>
Date: Sun, 15 May 2011 16:32:54 +0000 (+0200)
Subject: Merge branch 'master' into psgi
X-Git-Tag: 1.34~4^2~1
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Devel.git;a=commitdiff_plain;h=28323be6f68317a18b4253b762e5dc653cf954a8

Merge branch 'master' into psgi

* master:
  Fix failing test - render_file_contents is expected to return the filename
  Changelog
  set permissions of script/*.pl to 0755
  allow changing permissions to 0000
  Fix RT#67303: -scripts changes permissions of original files
  Fix duplicate 'use Test::More' statement in generated components
---

28323be6f68317a18b4253b762e5dc653cf954a8