Merge commit 'svn/trunk' into improved-restarter
authorFlorian Ragwitz <rafl@debian.org>
Mon, 11 May 2009 01:15:51 +0000 (01:15 +0000)
committerFlorian Ragwitz <rafl@debian.org>
Mon, 11 May 2009 01:15:51 +0000 (01:15 +0000)
commit09eff8556cf26d3d489876766b9a36230bc77854
tree0645df29187c5070f62230eb11fc6dc6aad93bd4
parent90d7479f063b5690833748d8619849b02e8dcbe0
parenta4a1253939f2c2fe3f824417f09ab7a43b1081f6
Merge commit 'svn/trunk' into improved-restarter

Conflicts:
Changes
Makefile.PL
lib/Catalyst/Devel.pm
lib/Catalyst/Helper.pm
Makefile.PL
lib/Catalyst/Helper.pm