Merge remote branch 'origin/topic/prepare_action_in_try'
authorTomas Doran <bobtfish@bobtfish.net>
Fri, 18 Nov 2011 14:42:16 +0000 (14:42 +0000)
committerTomas Doran <bobtfish@bobtfish.net>
Fri, 18 Nov 2011 14:42:16 +0000 (14:42 +0000)
commit42caa325b64b8b2f6ff316450ea9aeaece086fa9
tree18b74586491bb652fec6ce5cf01451ac6cd99cd8
parent1ce9c7f6a57e3d3ce511d87eb68c6a66ce9d96be
parent5e25c01fccd73dd1868c8be4df35be45d65e480f
Merge remote branch 'origin/topic/prepare_action_in_try'

* origin/topic/prepare_action_in_try:
  Explain the logic here, as it's crazy. But I think this works.
  Move prepare_action call into try block
lib/Catalyst.pm