Merge branch 'master' of ssh://git.shadowcat.co.uk/Catalyst-Runtime
authorJesse Sheidlower <jester@panix.com>
Sun, 14 Aug 2011 20:12:59 +0000 (16:12 -0400)
committerJesse Sheidlower <jester@panix.com>
Sun, 14 Aug 2011 20:12:59 +0000 (16:12 -0400)
commit862a7989fa3f15fe333c9fe46197e9840fc62808
tree9f7e3a741a50a89673d156e8096b32a481a663a0
parente60068484721132e6fe1855f53f9542d8bb17a35
parent14148e06102a2c318d4509e7a9d3345baeef4e8c
Merge branch 'master' of ssh://git.shadowcat.co.uk/Catalyst-Runtime

Conflicts:
lib/Catalyst/Upgrading.pod
lib/Catalyst/Upgrading.pod