Merge branch 'master' into psgi
authorFlorian Ragwitz <rafl@debian.org>
Sun, 15 May 2011 16:32:54 +0000 (18:32 +0200)
committerFlorian Ragwitz <rafl@debian.org>
Sun, 15 May 2011 16:32:54 +0000 (18:32 +0200)
commit28323be6f68317a18b4253b762e5dc653cf954a8
tree771e196c12b7570479af8442b595f4c6765d248c
parented763c0fa4b58576fbc2149b1d33ca74de1ad4dc
parent49d5395a6571edc9bee70605bd0818338c90f822
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
lib/Catalyst/Helper.pm