Merge branch 'master' into gsoc_breadboard
authorAndré Walker <andre@andrewalker.net>
Sat, 20 Oct 2012 04:30:19 +0000 (01:30 -0300)
committerAndré Walker <andre@andrewalker.net>
Sat, 20 Oct 2012 04:30:19 +0000 (01:30 -0300)
commit4055796051cccaa2276eca36b8661e3f785f7be3
tree6e65550cbcb05dbdc4847bd95384b4694bfeff7c
parentcc02d51ec40f498a948d21d3fe545671735df4e3
parent0b0aee670c39f8cb8f140eb62de9bfaf2c343a24
Merge branch 'master' into gsoc_breadboard

Conflicts:
lib/Catalyst.pm
t/aggregate/unit_core_mvc.t
Makefile.PL
lib/Catalyst.pm
lib/Catalyst/Controller.pm
t/aggregate/unit_core_mvc.t