Merge branch 'master' of git.shadowcat.co.uk:Catalyst-Manual-Monthly
Kieren Diment [Mon, 2 Apr 2012 12:11:46 +0000 (22:11 +1000)]

Trivial merge