Merge branch 'master' of git.shadowcat.co.uk:Catalyst-Plugin-Static-Simple
John Napiorkowski [Wed, 29 Oct 2014 15:35:47 +0000 (10:35 -0500)]

Trivial merge