Merge branch 'hamburg'
John Napiorkowski [Tue, 5 Nov 2013 21:30:59 +0000 (15:30 -0600)]
1  2 
lib/Catalyst/Controller.pm
lib/Catalyst/Plugin/Unicode/Encoding.pm

Simple merge